--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/radio_global.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,231 @@
+/*
+* 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;
+
+const int ONE_HERTZ = FREQUENCY_MULTIPLIER;
+
+/**
+ * Desired amount of steps in the volume control in the UI
+ */
+const int MAXIMUM_VOLUME_LEVEL = 20;
+
+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 Scroll
+{
+ enum Direction
+ {
+ Shortest,
+ Left,
+ Right
+ };
+}
+
+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
+ };
+}
+
+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_
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/radiologger.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,204 @@
+/*
+* 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/radiologger.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,363 @@
+/*
+* 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_
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/radionotificationdata.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,69 @@
+/*
+* 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/radioservicedef.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,74 @@
+/*
+* 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_CONTROL_SERVICE( "com.nokia.services.Radio.IRadioControl" );
+static const QLatin1String RADIO_MONITOR_SERVICE( "com.nokia.services.Radio.IRadioMonitor" );
+
+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
--- a/hswidgetplugin/buildflags.pri Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/buildflags.pri Fri Jun 11 13:38:32 2010 +0300
@@ -14,6 +14,65 @@
# Description:
#
+# ##########################################################
+# Start of Flag definitions
+# Add or remove comments to disable or enable the features
+# ##########################################################
+
+# ##########################################################
+# Start of Logging flag definitions
+# ##########################################################
+
+# Full logging flag that enables the full logging including also timestamps
+# Enabled by default in debug builds
+CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
+
+# Uncomment to enable full logging in release builds
+# LOGGING_FLAGS *= LOGGING_ENABLED
+
+# Timestamp logging flag that enables only timestamp logging
+# LOGGING_FLAGS += TIMESTAMP_LOGGING_ENABLED
+
+# Combines Ui and Engine logs by feeding UI traces to the engine logger
+# LOGGING_FLAGS += COMBINE_WITH_ENGINE_LOGGER
+
+# Logging level
+# 1 - Normal level
+# 2 - More verbose level
+# 3 - Most verbose level
+LOGGING_FLAGS += LOGGING_LEVEL=1
+
+# Select which radio component is being logged
+# 1 - Radio application
+# 2 - Radio homescreen widget
+LOGGING_FLAGS += LOGGED_COMPONENT=2
+
+contains(LOGGING_FLAGS, TIMESTAMP_LOGGING_ENABLED)|contains(LOGGING_FLAGS, LOGGING_ENABLED) {
+
+ # Writes debug prints to file if enabled
+ #LOGGING_FLAGS += TRACE_TO_FILE
+
+ # Settings for the log file name
+ symbian:contains(LOGGING_FLAGS, TRACE_TO_FILE) {
+ LOGGING_FLAGS += \"TRACE_OUTPUT_FILE=\\\"c:/logs/radio/fmradiohswidget.txt\\\"\"
+ LOGGING_FLAGS += FILTER_BY_LOGMARKER=true
+ }
+}
+
+# Method for testing signal-slot connections
+# 1 - Log failed connection
+# 2 - Log failed connection and halt debugger
+LOGGING_FLAGS += CONNECT_TEST_MODE=2
+
+# Logging is always enabled in Win32 environment
+win32:LOGGING_FLAGS *= LOGGING_ENABLED
+
+DEFINES += $$LOGGING_FLAGS
+
+# ##########################################################
+# End of Flag definitions
+# ##########################################################
+
# $$_PRO_FILE_PWD_ points to the directory of the pro file
MOC_DIR = $$_PRO_FILE_PWD_/tmp
RCC_DIR = $$_PRO_FILE_PWD_/tmp
--- a/hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.pro Fri Jun 11 13:38:32 2010 +0300
@@ -19,6 +19,8 @@
TEMPLATE = lib
CONFIG += plugin mobility hb
MOBILITY = serviceframework
+# Traslations is waiting for the widget specific ts
+#TRANSLATIONS += $${TARGET}.ts
LIBS += -lxqsettingsmanager \
-lxqservice \
@@ -26,9 +28,10 @@
HEADERS += ./inc/*.h
SOURCES += ./src/*.cpp
+SOURCES += ../../common/radiologger.cpp
INCLUDEPATH += ./inc
-INCLUDEPATH += ../../radioapp/commoninc
+INCLUDEPATH += ../../common
UID = 2002E6D6
@@ -42,23 +45,24 @@
TARGET.UID3 = 0x$${UID}
TARGET.EPOCALLOWDLLDATA=1
- TARGET.CAPABILITY = ALL -TCB
+ TARGET.VID = VID_DEFAULT
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
plugins.path = $${DESTDIR}
plugins.sources = $${TARGET}.dll
widgetResources.path = $${DESTDIR}
-# commented out
-# widgetResources.sources += resource/$${TARGET}.s60xml
-# Use this in emulator instead of xml in resources directory.
-# widgetResources.sources += $${TARGET}.xml
widgetResources.sources += resource/$${TARGET}.xml
widgetResources.sources += resource/$${TARGET}.manifest
-# icon is now removed to be able to unistall the widget more easily.
-# widgetResources.sources += resource/$${TARGET}_icon*.png
+ # icon is now removed to be able to unistall the widget more easily.
+ #widgetResources.sources += resource/$${TARGET}_icon*.png
+
+ localisedFiles.path = /resource/qt/translations
+ localisedFiles.sources += ./locales/*.qm
DEPLOYMENT += plugins \
- widgetResources
+ widgetResources \
+ localisedFiles
}
win32: {
@@ -76,6 +80,9 @@
manifest.path = $${DESTDIR}
manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.css #./resource/*.png
- INSTALLS += manifest
+ widgetLocalisation.path = $$PWD/../../../../../bin/$${SUBDIRPART}/resource/qt/translations
+ widgetLocalisation.files += ./locales/*.qm
+ INSTALLS += manifest
}
+
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidget.h Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidget.h Fri Jun 11 13:38:32 2010 +0300
@@ -34,16 +34,14 @@
class FmRadioHsWidgetProfileReader;
class QGraphicsLinearLayout;
-// Defines
+// Constants
+/** Path to docml file */
const QString KDocml = ":/ui/resource/fmradiohswidget.docml";
+/** Path to css file */
const QString KCss = ":/ui/resource/fmradiohswidgetplugin.css";
-
-// Constants
/** Key for radio information hash. */
const QString KRadioInformationStationName = "stationName";
/** Key for radio information hash. */
-const QString KRadioInformationCallSign = "callSign";
-/** Key for radio information hash. */
const QString KRadioInformationFrequency = "frequency";
/** Key for radio information hash. */
const QString KRadioInformationRt = "rt";
@@ -51,40 +49,24 @@
const QString KRadioInformationDynamicPsName = "dynamicPsName";
/** Key for radio information hash. */
const QString KRadioInformationPty = "pty";
-/** Key for radio information hash. */
-const QString KRadioInformationHomePage = "homePage";
-/** Key for radio information hash. */
-const QString KRadioInformationSong = "song";
-/** Text to display in widget. */
-const QString KFmRadioText = "FM Radio";
-/** Information text to connect headset. */
-const QString KConnectHeadsetText = "Connect wired headset.";
-/** Mhz text. */
-const QString KMhzText = "Mhz";
/** DOCML object name for mainLayout */
const QString KDocmlObjectNameMainLayout = "mainLayout";
-/** DOCML object name for radioIconPushButton */
-const QString KDocmlObjectNameRadioIconPushButton = "radioIconPushButton";
-/** DOCML object name for verticalSeparatorLabel */
-const QString KDocmlObjectNameVerticalSeparatorLabel = "verticalSeparatorLabel";
-/** DOCML object name for controlAreaLayout */
-const QString KDocmlObjectNameControlAreaLayout = "controlAreaLayout";
+/** DOCML object name for tunerBackgroundPushButton */
+const QString KDocmlObjectNameTunerBackgroundPushButton = "tunerBackgroundPushButton";
+/** DOCML object name for tunerStackedLayout */
+const QString KDocmlObjectNameTunerStackedLayout = "tunerStackedLayout";
+/** DOCML object name for tunerInformationStackedLayout */
+const QString KDocmlObjectNameTunerInformationStackedLayout = "tunerInformationStackedLayout";
+/** DOCML object name for controlButtons */
+const QString KDocmlObjectNameContolButtonsLayout = "controlButtons";
+/** DOCML object name for powerToggleButton */
+const QString KDocmlObjectNameowerToggleButton = "powerToggleButton";
/** DOCML object name for previousPushButton */
const QString KDocmlObjectNamePreviousPushButton = "previousPushButton";
-/** DOCML object name for verticalButtonSeparatorLabel1 */
-const QString KDocmlObjectNameVerticalButtonSeparatorLabel1 = "verticalButtonSeparatorLabel1";
-/** DOCML object name for playPushButton */
-const QString KDocmlObjectNamePlayPushButton = "playPushButton";
-/** DOCML object name for verticalButtonSeparatorLabel2 */
-const QString KDocmlObjectNameVerticalButtonSeparatorLabel2 = "verticalButtonSeparatorLabel2";
/** DOCML object name for nextPushButton */
const QString KDocmlObjectNameNextPushButton = "nextPushButton";
/** DOCML object name for twoRowsLayout */
const QString KDocmlObjectNameTwoRowsLayout = "twoRowsLayout";
-/** DOCML object name for oneRowLayout */
-const QString KDocmlObjectNameOneRowLayout = "oneRowLayout";
-/** DOCML object name for animationLayout */
-const QString KDocmlObjectNameAnimationLayout = "animationLayout";
/** DOCML object name for firstRowLabel */
const QString KDocmlObjectNameFirstRowLabel = "firstRowLabel";
/** DOCML object name for secondRowLabel */
@@ -93,16 +75,19 @@
const QString KDocmlObjectNameLonelyRowLabel = "lonelyRowLabel";
/** DOCML object name for animationIcon */
const QString KDocmlObjectNameAnimationIcon = "animationIcon";
+/** Delay which after the widget returns to the state where radio is not running. */
+const int KRadioStartingStateCancelDelay = 10000;
class FmRadioHsWidget : public HbWidget
{
Q_OBJECT
-
+ Q_PROPERTY(QString rootPath READ rootPath WRITE setRootPath)
public:
FmRadioHsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
~FmRadioHsWidget();
- // enum for commands controlling FM Radio
+public:
+ // Enum for commands controlling FM Radio.
enum FmRadioControlCommand
{
Mute,
@@ -111,7 +96,7 @@
NextChannel
};
- // enum for FM Radio states
+ // Enum for FM Radio states.
enum FmRadioState
{
Undefined,
@@ -121,10 +106,11 @@
ControllingAudio,
NotControllingAudio,
Seeking,
- AntennaNotConnected
+ AntennaNotConnected,
+ Closing
};
- // enum for information area layout states
+ // Enum for information area layout states.
enum InformationAreaLayout
{
OneRow,
@@ -132,99 +118,84 @@
Animation
};
- // enum for control button states
- enum ControlButtonState
- {
- AllDisabledPlay,
- AllDisabledStop,
- ChannelsDisabledPlay,
- ChannelsDisabledStop,
- ChannelsEnabledPlay,
- ChannelsEnabledStop
- };
-
- // enum for control button states
- enum PlayButtonState
- {
- PlayDisabled,
- PlayEnabled,
- StopDisabled,
- StopEnabled
- };
-
+ // Enum for control button position.
enum ControlButtonPosition
{
Left,
Center,
Right
};
+
+ QString rootPath()const;
+ void setRootPath(const QString &rootPath);
public slots:
- //void onInitialize(); // Can be used in future to get on intialize event.
+ void onInitialize();
void onShow();
void onHide();
//void onUninitialize(); // Can be used in future to get on unintialize event.
- bool eventFilter(QObject *target, QEvent *event);
-
private slots:
- void load(const QString docml);
-
- void mute();
- void unMute();
+ void load(const QString &docml);
+ void closeRadio();
void previousChannel();
void nextChannel();
void radioToForeground();
void radioToBackground();
- bool openUrl(QUrl url);
- void handleRadioInformationChange(int notificationId, QVariant value);
- bool updateRadioInformation(const QString informationType, QString information);
+ void handleRadioInformationChange(const int notificationId,
+ const QVariant &value);
+ bool updateRadioInformation(const QString &informationType,
+ const QString &information);
void radioInformationChanged();
void clearRadioInformation();
- void handleRadioStateChange(QVariant value);
+ void handleRadioStateChange(const QVariant &value);
- void changeInformationAreaLayout(InformationAreaLayout layout);
- void changeControlButtonState(ControlButtonState buttonState);
- void changePlayButtonState(PlayButtonState buttonState);
- void changeChannelButtonsEnabledState(bool enabled);
- void changeControlButtonFrameBackground(bool enabled, ControlButtonPosition position,
- HbPushButton *button);
+ void changeInformationAreaLayout(const InformationAreaLayout layout);
+ void changePowerButtonOn(const bool isPowerOn);
+ void changeStationButtonsEnabledState(const bool enabled);
+ void changeControlButtonFrameBackground(const bool enabled,
+ const ControlButtonPosition position, HbPushButton *button);
+
+ void cancelRadioStartingState();
+ void stopRadioStartingCancelTimer();
private:
// Data
Q_DISABLE_COPY(FmRadioHsWidget)
+ QString mRootPath;
+
+ // UI components.
HbPushButton *mRadioPushButton;
- HbLabel *mVerticalSeparatorLabel;
+ HbPushButton *mTunerBackgroundPushButton;
+ HbPushButton *mPowerToggleButton;
HbPushButton *mPreviousPushButton;
- HbLabel *mVerticalButtonSeparatorLabel1;
- HbPushButton *mPlayPushButton;
- HbLabel *mVerticalButtonSeparatorLabel2;
HbPushButton *mNextPushButton;
- QGraphicsWidget *mInformationAreaOneRowLayout;
QGraphicsWidget *mInformationAreaTwoRowsLayout;
- QGraphicsWidget *mInformationAreaAnimationLayout;
- HbLabel *mInformationFirstRowLabel; // This should be maybe a HbLineEdit for displaying and receiving click on url's.
- //HbMarqueeItem *mInformationFirstRowMarquee;
- HbLabel *mInformationSecondRowLabel;// HbLineEdit may also support marquee/scrolling.
- //HbMarqueeItem *mInformationSecondRowMarquee;
+ HbLabel *mInformationFirstRowLabel;
+ HbLabel *mInformationSecondRowLabel;
HbLabel *mInformationLonelyRowLabel;
- //HbMarqueeItem *mInformationLonelyRowMarquee;
HbLabel *mAnimationIcon;
+ // Stores the state of the FM Radio application.
FmRadioState mFmRadioState;
- PlayButtonState mPlayButtonState;
- bool mIsFavoriteChannels;
+ // Stores the presence of favorite stations.
+ bool mFavoriteStations;
- QHash<QString, QString> mRadioInformation; // Stores the radio information
+ // Stores the radio information.
+ QHash<QString, QString> mRadioInformation;
QString mRadioInformationFirstRow;
QString mRadioInformationSecondRow;
- FmRadioHsWidgetProcessHandler *mProcessHandler; // For launching the FM Radio application
+ // For reading P&S keys.
FmRadioHsWidgetProfileReader *mProfileMonitor;
- FmRadioHsWidgetRadioServiceClient *mRadioServiceClient; // For communicating with the FM Radio through Qt Highway
+ // For communicating with the FM Radio through Qt Highway.
+ FmRadioHsWidgetRadioServiceClient *mRadioServiceClient;
+
+ // For cancelinf the starting state after a delay.
+ QTimer *mRadioStartingCancelTimer;
};
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprocesshandler.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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: FM Radio widget process handler
-*
-*/
-
-#ifndef FMRADIOHSWIDGETPROCESSHANDLER_H_
-#define FMRADIOHSWIDGETPROCESSHANDLER_H_
-
-// System includes
-#include <QObject>
-#include <QProcess>
-
-// User includes
-
-// Forward declarations
-#include <QVariant>
-
-// Constants
-/** FM Radio application executable. */
-const QString KRadioExecutablePath = "/sys/bin/qtfmradio.exe"; // TODO: Remove the hard coded path and use some util to determine the path instead.
-/** Arguments for FM Radio application executable. */
-const QString KRadioExecutableArguments = "";
-
-class FmRadioHsWidgetProcessHandler : public QObject
-{
-Q_OBJECT
-
-public:
- FmRadioHsWidgetProcessHandler(QObject *parent = 0);
- ~FmRadioHsWidgetProcessHandler();
-
-public:
- void startFmRadioApplication();
-
-signals:
- void fmRadioApplicationStateChanged(QVariant state);
-
-public slots:
- void handleStateChange(QProcess::ProcessState state);
- void handleError(QProcess::ProcessError error);
- void handleFinish(int exitCode, QProcess::ExitStatus exitStatus);
-
-private:
- QProcess* mProcess;
-
-};
-
-#endif /* FMRADIOHSWIDGETPROCESSHANDLER_H_ */
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprofilereader.h Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprofilereader.h Fri Jun 11 13:38:32 2010 +0300
@@ -31,30 +31,25 @@
Q_OBJECT
public:
- FmRadioHsWidgetProfileReader(QObject *parent = 0);
+ explicit FmRadioHsWidgetProfileReader(QObject *parent = 0);
virtual ~FmRadioHsWidgetProfileReader();
- QVariant radioStatus();
-
signals:
- void profileChanged(int profile);
- void radioRunning(QVariant state);
+ //void profileChanged(int profile);
+ void radioRunning(const QVariant &state);
public slots:
- void itemDeleted(const XQSettingsKey& key);
- //void handleChanges(const XQSettingsKey& key, const QVariant& value);
- void handleRadioRunningChanges(const XQSettingsKey& key, const QVariant& value);
+ void itemDeleted(const XQSettingsKey &key);
+ void handleChanges(const XQSettingsKey &key, const QVariant &value);
+ void startMonitoringRadioRunningStatus();
private slots:
- void currentProfileStatus(QVariant value);
- void currentRadioRunningStatus(QVariant value);
-
- void startMonitoringRadioRunningStatus();
+ //void currentProfileStatus(const QVariant &value);
+ void currentRadioRunningStatus(const QVariant &value);
private: // data
XQSettingsManager *mSettingsManager; // For getting and P&S notifications
int mRadioStatus;
-
};
#endif /* FMRADIOHSWIDGETPROFILEREADER_H_ */
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetradioserviceclient.h Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetradioserviceclient.h Fri Jun 11 13:38:32 2010 +0300
@@ -28,11 +28,11 @@
const QString KRadioServiceName = "com.nokia.services.Radio";
/** Radio control interface name. */
const QString KRadioServiceControlInterfaceName = "IRadioControl";
-/** Radio monitor interface name. */
+/** Radio control operation name. */
const QString KRadioServiceControlOperation = "command(int)";
/** Radio monitor interface name. */
const QString KRadioServiceMonitorInterfaceName = "IRadioMonitor";
-/** Radio monitor interface name. */
+/** Radio monitor operation name. */
const QString KRadioServiceMonitorOperation = "requestNotifications()";
/** Radio refresh operation name. */
const QString KRadioServiceRefreshOperation = "requestAllData()";
@@ -42,24 +42,17 @@
Q_OBJECT
public:
- FmRadioHsWidgetRadioServiceClient(QObject *parent = 0);
+ explicit FmRadioHsWidgetRadioServiceClient(QObject *parent = 0);
virtual ~FmRadioHsWidgetRadioServiceClient();
- enum FmRadioStartupState
- {
- StartForeground,
- StartBackground
- };
- enum FmRadioChannelChangeCommand
+ // Enum for station changing command.
+ enum FmRadioStationChangeCommand
{
- PreviousFavouriteChannel,
- NextFavouriteChannel
+ PreviousFavouriteStation,
+ NextFavouriteStation
};
- enum FmRadioAudioControlCommand
- {
- Mute,
- Unmute
- };
+
+ // Enum for type of radio information.
enum FmRadioInformationType
{
InformationTypeStationName,
@@ -69,6 +62,8 @@
InformationTypeDynamicPsName,
InformationTypePty
};
+
+ // Enum for controlling the visibility of the radio application.
enum FmRadioVisibilty
{
DoNotChange,
@@ -76,37 +71,36 @@
ToBackground
};
- void init();
-
signals:
- void radioInformationChanged(int notificationId, QVariant value);
- void radioStateChanged(QVariant value);
+ void radioInformationChanged(const int notificationId,
+ const QVariant &value);
+ void radioStateChanged(const QVariant &value);
public slots:
- void doChangeFmRadioVisibility(FmRadioVisibilty visibility);
- void test();
- void doChangeFmRadioChannel(FmRadioChannelChangeCommand command);
- void doControlFmRadioAudio(FmRadioAudioControlCommand command);
- void handleFmRadioInformationChange(const QVariant& value);
- void handleFmRadioStateChange(QVariant& value);
- void startMonitoring(FmRadioVisibilty visibility);
+ void doCloseFmRadio();
+ void doPowerOnFmRadio();
+ void doChangeFmRadioVisibility(const FmRadioVisibilty visibility);
+ void doChangeFmRadioStation(const FmRadioStationChangeCommand command);
+ void handleFmRadioInformationChange(const QVariant &value);
+ void handleFmRadioStateChange(const QVariant &value);
+ void startMonitoring(const FmRadioVisibilty visibility);
void stopMonitoring();
protected slots:
- void requestCompleted(const QVariant& value);
private slots:
- //void handleOk(const QVariant &result);
- void handleError(int errorCode, const QString& errorMessage);
- void handleRequestError(int error);
+ void handleError(const int errorCode, const QString &errorMessage);
+ void handleRequestError(const int error);
void createControlServiceRequest();
void createMonitorServiceRequest();
- void doSendMonitorRequest(FmRadioVisibilty visibility);
- void doSendControlRequest(QVariant &argument, FmRadioVisibilty visibility);
+ void doSendMonitorRequest(const FmRadioVisibilty visibility);
+ void doSendControlRequest(const QVariant &argument,
+ const FmRadioVisibilty visibility);
- void prepareRequestInfo(XQAiwRequest *request, FmRadioVisibilty visibility);
+ void prepareRequestInfo(XQAiwRequest *request,
+ const FmRadioVisibilty visibility);
private: // data
bool mRequestPending;
@@ -114,8 +108,7 @@
XQAiwRequest* mRadioMonitorRequest;
XQAiwRequest* mRadioControlRequest;
- bool mDataInitialized;
-
+ bool mDataInitialized;
};
#endif /* FMRADIOHSWIDGETRADIOSERVICECLIENT_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hswidgetplugin/fmradiohswidgetplugin/locales/compile_ts.bat Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,10 @@
+@echo off
+
+set QM_FILE=fmradiohswidgetplugin.qm
+set QM_FILE_EN_US=fmradiohswidgetplugin_en_us.qm
+set QM_LOCATION=./
+
+
+ECHO Creating QM file
+call lrelease -idbased fmradiohswidgetplugin.ts -qm %QM_LOCATION%%QM_FILE%
+REM call lrelease -idbased fmradiohswidgetplugin_en_us.ts -qm %QM_LOCATION%%QM_FILE_EN_US%
Binary file hswidgetplugin/fmradiohswidgetplugin/locales/fmradiohswidgetplugin.qm has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hswidgetplugin/fmradiohswidgetplugin/locales/fmradiohswidgetplugin.ts Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="3.0" sourcelanguage="en_GB">
+<context>
+<message numerus="no" id="txt_rad_info_country_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Country Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_social_affairs_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Social Affairs</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_weather_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Weather</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_personality_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Personality</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_soft_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Soft</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_rhythm_and_blues_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Rhythm and blues</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_information_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Information</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_phone_in_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Phone In</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_current_affairs_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Current affairs</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_alarm_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Alarm</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_leisure_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Leisure</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_childrens_programmes_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Children’s programmes</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_light_classical_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Light classical</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_alarm_test_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Alarm Test</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_religious_talk_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Religious talk</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_list_fm_radio">
+ <comment>Text in a home screen widget information area. Displayed when no station is tuned.</comment>
+ <source>FM Radio</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_list_fm_radio</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>list</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_news_hs">
+ <comment>Displayed in FM Radio home screen widget's information area. Custom layout parent string.</comment>
+ <source>News</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_easy_listening_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Easy Listening</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_top_40_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Top 40</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_public_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Public</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_varied_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Varied</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_nostalgia_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Nostalgia</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_classical_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Classical</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_national_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>National Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_science_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Science</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_jazz_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Jazz Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_religious_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Religious music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_other_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Other Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_folk_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Folk Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_religion_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Religion</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_soft_rock_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Soft rock</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_adult_hits_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Adult hits</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_drama_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Drama</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_rock_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Rock Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_serious_classical_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Serious classical</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_college_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>College</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_connect_wired_headset">
+ <comment>Notification text which is displayed in home screen widget, when the headset antenna is not connected.</comment>
+ <source>Connect wired headset.</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_oldies_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Oldies Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_documentary_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Documentary</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_education_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Education</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_sport_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Sport</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_pop_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Pop Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_language_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Language</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_classic_rock_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Classic rock</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_list_l1_mhz">
+ <comment>Text in a home screen widget information area. %L1 is the radio station's frequency.</comment>
+ <source>%L1 Mhz</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_list_l1_mhz</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>list</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_soft_rhythm_and_blues_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Soft rhythm and blues</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_culture_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Culture</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_talk_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Talk</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_finance_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Finance</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_activate_radio_in_offline_mode_hs">
+ <comment>Confirmation query which is displayed when the FM Radio is launched from the FM Radio home screen widget while the device is in offline mode. (Note that same text is also in FM radio textmap.)</comment>
+ <source>Activate Fm Radio in off-line mode?</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_travel_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Travel</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+</context>
+</TS>
--- a/hswidgetplugin/fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin Fri Jun 11 13:38:32 2010 +0300
@@ -1,1 +1,1 @@
-This file is a Qt plugin stub file. The real Qt plugin is located in /sys/bin. Created:2010-04-23T11:50:39
+This file is a Qt plugin stub file. The real Qt plugin is located in /sys/bin. Created:2010-05-05T10:52:10
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidget.docml Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidget.docml Fri Jun 11 13:38:32 2010 +0300
@@ -1,125 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="1.0">
<widget name="mainLayout" type="HbWidget">
- <widget name="radioIconPushButton" type="HbPushButton">
- <icon iconName="qtg_large_radio" name="background"/>
+ <widget name="controlButtons" type="HbWidget">
+ <widget name="powerToggleButton" type="HbPushButton">
+ <bool name="checkable" value="TRUE"/>
+ <string name="text"/>
+ </widget>
+ <widget name="previousPushButton" type="HbPushButton">
+ <icon iconName="qtg_mono_previous" name="icon"/>
+ <string name="text"/>
+ </widget>
+ <widget name="nextPushButton" type="HbPushButton">
+ <icon iconName="qtg_mono_next" name="icon"/>
+ <string name="text"/>
+ </widget>
+ <real name="z" value="0"/>
<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="11un" type="PREFERRED" width="11un"/>
- <contentsmargins bottom="expr((17un - 11un) / 2)" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="expr((17un - 11un) / 2)"/>
- <string name="text"/>
- <bool name="stretched" value="FALSE"/>
+ <sizehint height="8un" type="PREFERRED" width="32un"/>
+ <sizehint height="8un" type="MINIMUM" width="32un"/>
+ <layout orientation="Horizontal" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="powerToggleButton"/>
+ <linearitem itemname="previousPushButton"/>
+ <linearitem itemname="nextPushButton"/>
+ </layout>
</widget>
- <widget name="rightSideLayout" type="HbWidget">
- <widget name="informationAreaLayout" type="HbWidget">
+ <widget name="tunerStackedLayout" type="HbWidget">
+ <widget name="tunerInformationStackedLayout" type="HbWidget">
+ <widget name="lonelyRowLabel" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <string name="plainText"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-tiny)"/>
+ </widget>
<widget name="twoRowsLayout" type="HbWidget">
<widget name="firstRowLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="3un" type="PREFERRED" width="32.5un"/>
+ <real name="z" value="1"/>
+ <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <string name="plainText"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
<widget name="secondRowLabel" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="3un" type="PREFERRED" width="32.5un"/>
+ <real name="z" value="2"/>
+ <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <string name="plainText"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-tiny)"/>
</widget>
- <real name="z" value="0"/>
- <sizehint height="expr(var(hb-param-margin-gene-middle-vertical) + (var(hb-param-text-height-tiny) * 2))" type="PREFERRED" width="31.5un"/>
- <bool name="visible" value="FALSE"/>
+ <real name="z" value="3"/>
+ <sizehint height="expr(10un - 2 * 1.5un )" type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
<layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="firstRowLabel" spacing="var(hb-param-margin-gene-middle-vertical)"/>
- <linearitem itemname="secondRowLabel" spacing="0un"/>
+ <linearitem itemname="firstRowLabel"/>
+ <linearitem itemname="secondRowLabel"/>
</layout>
</widget>
- <widget name="oneRowLayout" type="HbWidget">
- <widget name="lonelyRowLabel" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="6.625un" type="PREFERRED" width="32.5un"/>
- </widget>
- <real name="z" value="0"/>
- <sizehint height="expr(var(hb-param-margin-gene-middle-vertical) + (var(hb-param-text-height-tiny) * 2))" type="PREFERRED" width="31.5un"/>
- <sizehint type="MINIMUM" width="0.74627un"/>
- <bool name="visible" value="FALSE"/>
- <layout orientation="Vertical" spacing="0un" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="lonelyRowLabel"/>
- </layout>
+ <widget name="animationIcon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName="qtg_anim_loading_1" name="icon"/>
+ <sizehint height="var(hb-param-graphic-size-primary-medium)" type="PREFERRED" width="var(hb-param-graphic-size-primary-medium)"/>
</widget>
- <widget name="animationLayout" type="HbWidget">
- <widget name="animationIcon" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="var(hb-param-graphic-size-primary-medium)" type="PREFERRED" width="var(hb-param-graphic-size-primary-medium)"/>
- </widget>
- <real name="z" value="0"/>
- <sizehint height="expr(var(hb-param-margin-gene-middle-vertical) + (var(hb-param-text-height-tiny) * 2))" type="PREFERRED" width="31.5un"/>
- <bool name="visible" value="FALSE"/>
- <layout orientation="Vertical" spacing="0un" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="animationIcon"/>
- </layout>
- </widget>
- <real name="z" value="0"/>
- <sizehint height="expr(var(hb-param-margin-gene-middle-vertical) + (var(hb-param-text-height-tiny) * 2))" type="PREFERRED" width="31.5un"/>
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
+ <real name="z" value="1"/>
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="7un" type="PREFERRED" width="30.5un"/>
+ <sizehint height="expr(10un - 2 * 1.5un)" type="MINIMUM" width="expr(32un - 4 * var(hb-param-margin-gene-middle-horizontal))"/>
+ <contentsmargins bottom="1.5un" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="1.5un"/>
+ <sizehint height="2504062.01158un" type="MAXIMUM" width="2504062.01158un"/>
<layout type="stacked">
+ <stackitem itemname="lonelyRowLabel"/>
<stackitem itemname="twoRowsLayout"/>
- <stackitem itemname="oneRowLayout"/>
- <stackitem itemname="animationLayout"/>
+ <stackitem itemname="animationIcon"/>
</layout>
</widget>
- <widget name="controlAreaLayout" type="HbWidget">
- <widget name="previousPushButton" type="HbPushButton">
- <icon iconName="qtg_mono_previous" name="icon"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="8un" type="PREFERRED" width="expr(31.5un /3)"/>
- <string name="text"/>
- <bool name="enabled" value="FALSE"/>
- </widget>
- <widget name="playPushButton" type="HbPushButton">
- <icon iconName="qtg_mono_play" name="icon"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="8un" type="PREFERRED" width="expr(31.5un /3)"/>
- <string name="text"/>
- <bool name="enabled" value="FALSE"/>
- </widget>
- <widget name="nextPushButton" type="HbPushButton">
- <icon iconName="qtg_mono_next" name="icon"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="8un" type="PREFERRED" width="expr(31.5un /3)"/>
- <string name="text"/>
- <bool name="enabled" value="FALSE"/>
- </widget>
- <real name="z" value="1"/>
- <sizehint height="8un" type="PREFERRED" width="31.5un"/>
- <sizehint height="0un" type="MINIMUM" width="0un"/>
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <layout orientation="Horizontal" spacing="0un" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="previousPushButton" spacing="0un"/>
- <linearitem itemname="playPushButton" spacing="0un"/>
- <linearitem itemname="nextPushButton"/>
- </layout>
+ <widget name="tunerBackgroundPushButton" type="HbPushButton">
+ <sizehint height="10un" type="PREFERRED" width="32un"/>
+ <sizehint type="MINIMUM" width="32un"/>
+ <string name="text"/>
+ <string name="state" value="normal"/>
</widget>
<real name="z" value="0"/>
- <sizehint height="expr((var(hb-param-margin-gene-middle-vertical) * 4) + (var(hb-param-text-height-tiny) * 2) + 8un)" type="PREFERRED" width="expr(46un - 11un - 2px - (2 * var(hb-param-margin-gene-middle-horizontal)))"/>
- <contentsmargins bottom="var(hb-param-margin-gene-middle-vertical)" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="var(hb-param-margin-gene-middle-vertical)"/>
- <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="informationAreaLayout" spacing="var(hb-param-margin-gene-middle-vertical)"/>
- <linearitem itemname="controlAreaLayout" spacing="0un"/>
+ <sizehint height="10un" type="PREFERRED" width="32un"/>
+ <sizehint height="10un" type="MINIMUM" width="32un"/>
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <layout type="stacked">
+ <stackitem itemname="tunerInformationStackedLayout"/>
+ <stackitem itemname="tunerBackgroundPushButton"/>
</layout>
</widget>
- <widget name="verticalSeparatorLabel" type="HbLabel">
- <sizehint height="expr((var(hb-param-margin-gene-middle-vertical) * 4) + (var(hb-param-text-height-tiny) * 2) + 8un)" type="PREFERRED" width="2"/>
- <contentsmargins bottom="2" left="0un" right="0un" top="2"/>
- </widget>
- <real name="z" value="1"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="expr((var(hb-param-margin-gene-middle-vertical) * 4) + (var(hb-param-text-height-tiny) * 2) + 8un)" type="PREFERRED" width="46un"/>
- <layout orientation="Horizontal" spacing="0un" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="radioIconPushButton" spacing="0un" stretchfactor="-1"/>
- <linearitem itemname="verticalSeparatorLabel" spacing="0un"/>
- <linearitem itemname="rightSideLayout" spacing="0un"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="26.5un" type="FIXED" width="37un"/>
+ <sizehint height="26.5un" type="MINIMUM"/>
+ <sizehint height="26.5un" type="MAXIMUM" width="37un"/>
+ <layout orientation="Vertical" spacing="0un" type="linear">
+ <contentsmargins bottom="2un" left="2.5un" right="2.5un" top="5.5un"/>
+ <linearitem itemname="tunerStackedLayout" spacing="var(hb-param-margin-gene-middle-vertical)"/>
+ <linearitem itemname="controlButtons" spacing="0un"/>
</layout>
</widget>
<metadata activeUIState="Common ui state" display="NHD landscape" unit="un">
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css Fri Jun 11 13:38:32 2010 +0300
@@ -21,3 +21,48 @@
text-align: center center;
text-wrap-mode: no-wrap;
}
+
+HbPushButton#tunerBackgroundPushButton::text,
+HbPushButton[state = "normal"]#tunerBackgroundPushButton::text {
+ color: grey;
+ text-align: left bottom;
+}
+
+HbPushButton[state = "normal"]#tunerBackgroundPushButton::background {
+ border-width: 1un;
+}
+
+HbPushButton[state = "highlight"]#tunerBackgroundPushButton::text {
+ color: yellow;
+ text-align: right top;
+}
+
+HbPushButton[state = "pressed"]#tunerBackgroundPushButton::text {
+ color: red;
+ text-align: center center;
+}
+
+HbPushButton[state = "normal"]#tunerBackgroundPushButton::background {
+ frame-graphics-name: "qtg_fr_tuner";
+ frame-graphics-type: ThreePiecesHorizontal;
+}
+
+HbPushButton[state = "pressed"]#tunerBackgroundPushButton::background {
+ frame-graphics-name: "qtg_fr_hsitems2_pressed";
+ frame-graphics-type: NinePieces;
+}
+
+
+HbPushButton[state = "latched"]#tunerBackgroundPushButton::text {
+ color: green;
+ text-align: top center;
+}
+
+HbPushButton[state = "latched"]#tunerBackgroundPushButton::background {
+ border-width: 0un;
+}
+
+HbPushButton[state = "disabled"]#tunerBackgroundPushButton::text {
+ color: brown;
+ text-align: right bottom;
+}
Binary file hswidgetplugin/fmradiohswidgetplugin/resource/mono_power.png has changed
Binary file hswidgetplugin/fmradiohswidgetplugin/resource/qtg_graf_hsradio_bg.png has changed
--- a/hswidgetplugin/fmradiohswidgetplugin/resources.qrc Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/resources.qrc Fri Jun 11 13:38:32 2010 +0300
@@ -2,5 +2,7 @@
<qresource prefix="/ui">
<file>resource/fmradiohswidget.docml</file>
<file>resource/fmradiohswidgetplugin.css</file>
+ <file>resource/mono_power.png</file>
+ <file>resource/qtg_graf_hsradio_bg.png</file>
</qresource>
</RCC>
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidget.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidget.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -25,62 +25,52 @@
#include <HbIconAnimationManager>
#include <HbIconAnimationDefinition>
#include <HbColorScheme>
-#include <HbMarqueeItem>
-#include <HbStyleLoader>
#include <QGraphicsLinearLayout>
#include <QGraphicsItem>
#include <QDesktopServices>
+#include <QTimer>
// User includes
#include "fmradiohswidget.h"
-#include "fmradiohswidgetprocesshandler.h"
#include "fmradiohswidgetprofilereader.h"
#include "fmradiohswidgetradioserviceclient.h"
#include "radioservicedef.h"
#include "radio_global.h"
+#include "radiologger.h"
/*!
\ingroup group_fmradiohs_widget
\class FmRadioHsWidget
\brief Example implementation for home screen widget.
- FmRadioHsWidget derived from the HbWidget and implements
- needed functions for the home screen widget.
+ FmRadioHsWidget implements needed functions for the FM Radio home screen
+ widget.
*/
// ======== MEMBER FUNCTIONS ========
/*!
Constructs a widget which is a child of \a parent, with widget flags set to \a flags.
+
+ Constructor should be empty and all the actual construction should be
+ done in onInitialize().
*/
FmRadioHsWidget::FmRadioHsWidget(QGraphicsItem* parent, Qt::WindowFlags flags)
: HbWidget(parent, flags),
- mRadioPushButton(0),
- mPreviousPushButton(0),
- mPlayPushButton(0),
- mNextPushButton(0),
- mInformationFirstRowLabel(0),
- mInformationSecondRowLabel(0),
+ mTunerBackgroundPushButton(NULL),
+ mPowerToggleButton(NULL),
+ mPreviousPushButton(NULL),
+ mNextPushButton(NULL),
+ mInformationFirstRowLabel(NULL),
+ mInformationSecondRowLabel(NULL),
mFmRadioState(Undefined),
- mPlayButtonState(PlayEnabled),
- mIsFavoriteChannels(false),
+ mFavoriteStations(false),
mRadioInformation(QHash<QString, QString>()),
- mProcessHandler(0),
- mProfileMonitor(new FmRadioHsWidgetProfileReader(this)),
- mRadioServiceClient(new FmRadioHsWidgetRadioServiceClient(this))
+ mProfileMonitor(NULL),
+ mRadioServiceClient(NULL),
+ mRadioStartingCancelTimer(NULL)
{
- connect(mRadioServiceClient, SIGNAL(radioInformationChanged(int, QVariant)), this,
- SLOT(handleRadioInformationChange(int, QVariant)));
- connect(mRadioServiceClient, SIGNAL(radioStateChanged(QVariant)), this,
- SLOT(handleRadioStateChange(QVariant)));
- connect(mProfileMonitor, SIGNAL(radioRunning(QVariant)), this,
- SLOT(handleRadioStateChange(QVariant)));
-
- load(KDocml);
-
- handleRadioStateChange(mProfileMonitor->radioStatus());
-
- //mRadioServiceClient->init();
+ LOG_METHOD_ENTER;
}
/*!
@@ -88,6 +78,47 @@
*/
FmRadioHsWidget::~FmRadioHsWidget()
{
+ LOG_METHOD;
+}
+
+/*!
+ Getter for /r mRootPath property.
+*/
+QString FmRadioHsWidget::rootPath()const
+{
+ LOG_METHOD_ENTER;
+ return mRootPath;
+}
+
+/*!
+ Sets the mRoothPath propertry to /a roothPath.
+*/
+void FmRadioHsWidget::setRootPath(const QString &rootPath)
+{
+ LOG_METHOD_ENTER;
+ mRootPath = rootPath;
+}
+
+/*!
+ Called when widget is initialized. Constructs objects and connects them.
+*/
+void FmRadioHsWidget::onInitialize()
+{
+ LOG_METHOD_ENTER;
+ mProfileMonitor = new FmRadioHsWidgetProfileReader(this);
+ mRadioServiceClient = new FmRadioHsWidgetRadioServiceClient(this);
+ mRadioStartingCancelTimer = new QTimer(this);
+
+ connect(mRadioServiceClient, SIGNAL(radioInformationChanged(int, QVariant)), this,
+ SLOT(handleRadioInformationChange(int, QVariant)));
+ connect(mRadioServiceClient, SIGNAL(radioStateChanged(QVariant)), this,
+ SLOT(handleRadioStateChange(QVariant)));
+ connect(mProfileMonitor, SIGNAL(radioRunning(QVariant)), this,
+ SLOT(handleRadioStateChange(QVariant)));
+
+ load(KDocml);
+
+ mProfileMonitor->startMonitoringRadioRunningStatus();
}
/*!
@@ -95,6 +126,7 @@
*/
void FmRadioHsWidget::onShow()
{
+ LOG_METHOD_ENTER;
}
/*!
@@ -102,255 +134,222 @@
*/
void FmRadioHsWidget::onHide()
{
+ LOG_METHOD_ENTER;
}
/*!
Loads docml files.
*/
-void FmRadioHsWidget::load(const QString docml)
+void FmRadioHsWidget::load(const QString &docml)
{
- bool loaded = false;
+ LOG_METHOD_ENTER;
HbDocumentLoader *documentLoader = new HbDocumentLoader();
documentLoader->reset();
+ bool loaded = false;
documentLoader->load(docml, &loaded);
if (loaded) {
- HbWidget *widget = qobject_cast<HbWidget*> (documentLoader->findWidget(
+ // Find mainLayout
+ HbWidget *mainLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
KDocmlObjectNameMainLayout));
-
+ // For drawing frame backgrounds
HbFrameItem *frameItem = NULL;
- if (widget) {
- //HbWidget *view = qobject_cast<HbWidget*> (widget);
+ if (mainLayout) {
QGraphicsLinearLayout *mWidgetLayout = new QGraphicsLinearLayout(Qt::Vertical, this);
-
- HbFrameDrawer *drawer = new HbFrameDrawer("qtg_fr_hswidget_normal",
- HbFrameDrawer::NinePieces);
- frameItem = new HbFrameItem(drawer, widget);
- frameItem->setPreferredSize(widget->preferredSize());
-
- mWidgetLayout->addItem(widget);
- setLayout(mWidgetLayout);
- }
-
- mRadioPushButton = qobject_cast<HbPushButton*> (documentLoader->findWidget(
- KDocmlObjectNameRadioIconPushButton));
- if (mRadioPushButton) {
- if (frameItem) {
- frameItem->stackBefore(mRadioPushButton);
- }
- mRadioPushButton->setBackground(HbIcon("qtg_large_radio"));
- mRadioPushButton->icon().setSize(mRadioPushButton->preferredSize());
- QObject::connect(mRadioPushButton, SIGNAL(clicked()), this, SLOT(radioToForeground()));
- }
+
+ // Temporarily use graphics from resources. Change to the system
+ // graphics when they are available.
+ HbFrameDrawer *drawer = new HbFrameDrawer(
+ ":/ui/resource/qtg_graf_hsradio_bg.png",
+ HbFrameDrawer::OnePiece);
+ //HbFrameDrawer *drawer = new HbFrameDrawer("qtg_fr_hswidget_normal",
+ // HbFrameDrawer::NinePieces);
+ frameItem = new HbFrameItem(drawer, mainLayout);
+ frameItem->setPreferredSize(mainLayout->preferredSize());
- mVerticalSeparatorLabel = qobject_cast<HbLabel*> (documentLoader->findWidget(
- KDocmlObjectNameVerticalSeparatorLabel));
- if (mVerticalSeparatorLabel) {
- mVerticalSeparatorLabel->setIcon(HbIcon("qtg_graf_divider_v_thin"));
- }
-
- HbWidget *controlAreaLayoutWidget = qobject_cast<HbWidget*> (documentLoader->findWidget(
- KDocmlObjectNameControlAreaLayout));
- if (controlAreaLayoutWidget) {
- }
-
- mPreviousPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
- KDocmlObjectNamePreviousPushButton));
- if (mPreviousPushButton) {
- changeControlButtonFrameBackground(false, Left, mPreviousPushButton);
-/*
- HbFrameDrawer *previousButtonFrameDrawer = new HbFrameDrawer("qtg_fr_hsbutton_disabled",
- HbFrameDrawer::ThreePiecesHorizontal);
- previousButtonFrameDrawer->setFileNameSuffixList(QStringList() << "_l" << "_c" << "_cr");
- mPreviousPushButton->setFrameBackground(previousButtonFrameDrawer);
-*/ QObject::connect(mPreviousPushButton, SIGNAL(clicked()), this, SLOT(previousChannel()));
- }
-
- mPlayPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
- KDocmlObjectNamePlayPushButton));
- if (mPlayPushButton) {
- changeControlButtonFrameBackground(false, Center, mPlayPushButton);
-/* HbFrameDrawer *playButtonFrameDrawer = new HbFrameDrawer("qtg_fr_hsbutton_disabled",
- HbFrameDrawer::ThreePiecesHorizontal);
- playButtonFrameDrawer->setFileNameSuffixList(QStringList() << "_cl" << "_c" << "_cr");
- mPlayPushButton->setFrameBackground(playButtonFrameDrawer);
-*/ QObject::connect(mPlayPushButton, SIGNAL(clicked()), this, SLOT(radioToBackground()));
- }
-
- mNextPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
- KDocmlObjectNameNextPushButton));
- if (mNextPushButton) {
- changeControlButtonFrameBackground(false, Right, mNextPushButton);
-/* HbFrameDrawer *nextButtonFrameDrawer = new HbFrameDrawer("qtg_fr_hsbutton_disabled",
- HbFrameDrawer::ThreePiecesHorizontal);
- nextButtonFrameDrawer->setFileNameSuffixList(QStringList() << "_cl" << "_c" << "_r");
- mNextPushButton->setFrameBackground(nextButtonFrameDrawer);
-*/ QObject::connect(mNextPushButton, SIGNAL(clicked()), this, SLOT(nextChannel()));
+ mWidgetLayout->addItem(mainLayout);
+ setLayout(mWidgetLayout);
}
- //bool b = QFile::exists(KCss);
- bool a = HbStyleLoader::registerFilePath(KCss);
+ // Find stacked layout for tuner area.
+ HbWidget *tunerStackedLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
+ KDocmlObjectNameTunerStackedLayout));
+ if (tunerStackedLayout) {
+
+ // Find stacked layout for information area.
+ HbWidget *tunerInformationStackedLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
+ KDocmlObjectNameTunerInformationStackedLayout));
+ if (tunerInformationStackedLayout) {
+
+ // MarqueeItem tests.
+ /*
+ QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, mInformationAreaOneRowLayout);
+ mInformationLonelyRowMarquee = new HbMarqueeItem();
+ mInformationLonelyRowMarquee->setObjectName("marquee3");
+ HbStyle::setItemName(mInformationLonelyRowMarquee, "marquee3");
+ mInformationLonelyRowMarquee->setText(
+ "Long text");
+ mInformationLonelyRowMarquee->setLoopCount(-1);
+ mInformationLonelyRowMarquee->startAnimation();
+ HbFontSpec fs(HbFontSpec::Secondary);
+ mInformationLonelyRowMarquee->setFontSpec(fs);
+ mInformationLonelyRowMarquee->setTextColor(HbColorScheme::color("qtc_hs_list_item_title"));
+ mInformationLonelyRowMarquee->setPreferredSize(layout->preferredSize());
+ layout->addItem(mInformationLonelyRowMarquee);
+ */
+ /*
+ }
+ */
+
+ // Find lonely label
+ mInformationLonelyRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
+ KDocmlObjectNameLonelyRowLabel));
+ if (mInformationLonelyRowLabel) {
+ QColor color = HbColorScheme::color("qtc_radio_tuner_normal");
+ if (color.isValid()) {
+ mInformationLonelyRowLabel->setTextColor(color);
+ }
+ }
+
+ // Find layout for two rows
+ mInformationAreaTwoRowsLayout = qobject_cast<QGraphicsWidget *> (
+ documentLoader->findObject(KDocmlObjectNameTwoRowsLayout));
+ if (mInformationAreaTwoRowsLayout) {
+ // Find first row
+ mInformationFirstRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
+ KDocmlObjectNameFirstRowLabel));
+ if (mInformationFirstRowLabel) {
+ QColor color = HbColorScheme::color("qtc_radio_tuner_normal");
+ if (color.isValid()) {
+ mInformationFirstRowLabel->setTextColor(color);
+ }
+ }
- mInformationAreaTwoRowsLayout = qobject_cast<QGraphicsWidget *> (
- documentLoader->findObject(KDocmlObjectNameTwoRowsLayout));
- if (mInformationAreaTwoRowsLayout) {
- /*
- QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, mInformationAreaTwoRowsLayout);
- mInformationFirstRowMarquee = new HbMarqueeItem();
- HbStyle::setItemName(mInformationFirstRowMarquee, "marquee1");
- mInformationFirstRowMarquee->setObjectName("marquee1");
- mInformationFirstRowMarquee->setText(
- "Long text");
- mInformationFirstRowMarquee->setLoopCount(-1);
- mInformationFirstRowMarquee->startAnimation();
- HbFontSpec fs(HbFontSpec::Secondary);
- mInformationFirstRowMarquee->setFontSpec(fs);
- mInformationFirstRowMarquee->setTextColor(HbColorScheme::color("qtc_hs_list_item_title"));
- mInformationFirstRowMarquee->setPreferredSize(layout->preferredSize());
- layout->addItem(mInformationFirstRowMarquee);
-
- mInformationSecondRowMarquee = new HbMarqueeItem();
- mInformationSecondRowMarquee->setObjectName("marquee2");
- mInformationSecondRowMarquee->setText(
- "Long text to test marquee, Long text to test marquee");
- mInformationSecondRowMarquee->setLoopCount(-1);
- mInformationSecondRowMarquee->startAnimation();
- mInformationSecondRowMarquee->setFontSpec(fs);
- mInformationSecondRowMarquee->setTextColor(HbColorScheme::color("qtc_hs_list_item_title"));
- mInformationSecondRowMarquee->setPreferredSize(layout->preferredSize());
- layout->addItem(mInformationSecondRowMarquee);
- */
+ // Find second row
+ mInformationSecondRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
+ KDocmlObjectNameSecondRowLabel));
+ if (mInformationSecondRowLabel) {
+ QColor color = HbColorScheme::color("qtc_radio_tuner_normal");
+ if (color.isValid()) {
+ mInformationSecondRowLabel->setTextColor(color);
+ }
+ }
+
+ }
+
+
+ mAnimationIcon = qobject_cast<HbLabel *> (documentLoader->findWidget(
+ KDocmlObjectNameAnimationIcon));
+ if (mAnimationIcon) {
+ // Use animation manager to define the frame-by-frame animation.
+ HbIconAnimationManager *animationManager = HbIconAnimationManager::global();
+
+ // Create animation definition.
+ HbIconAnimationDefinition animationDefinition;
+ QList<HbIconAnimationDefinition::AnimationFrame> animationFrameList;
+
+ // This should be probably done by loading axml instead.
+ HbIconAnimationDefinition::AnimationFrame animationFrame;
+ QString animationFrameIconName;
+ QString animationFrameIconNamePrefix = "qtg_anim_loading_";
+ for (int i = 1; i < 11; i++) {
+ animationFrame.duration = 100;
+ animationFrameIconName.clear();
+ animationFrameIconName.append(animationFrameIconNamePrefix);
+ animationFrameIconName.append(animationFrameIconName.number(i));
+ animationFrame.iconName = animationFrameIconName;
+ animationFrameList.append(animationFrame);
+ }
+ animationDefinition.setPlayMode(HbIconAnimationDefinition::Loop);
+ animationDefinition.setFrameList(animationFrameList);
+ animationManager->addDefinition("animation", animationDefinition);
+
+ // Construct an icon using the animation definition.
+ HbIcon icon("animation");
+
+ mAnimationIcon->setIcon(icon);
+ }
+
+ }
+
+ // Find push button for tuner area.
+ mTunerBackgroundPushButton = qobject_cast<HbPushButton*> (documentLoader->findWidget(
+ KDocmlObjectNameTunerBackgroundPushButton));
+ if (mTunerBackgroundPushButton) {
+ // Test different states.
+ //bool p = mTunerBackgroundPushButton->setProperty("state", "normal");
+ // Try css for controlling the appearance.
+ //bool b = QFile::exists(KCss);
+ //bool cssLoaded = HbStyleLoader::registerFilePath(KCss);
+ //HbStyle::setItemName(mTunerBackgroundPushButton, KDocmlObjectNameTunerBackgroundPushButton);
+ // Use the frame background.
+ HbFrameDrawer *tunerBackgroundButtonFrameDrawer = new HbFrameDrawer(
+ "qtg_fr_tuner", HbFrameDrawer::ThreePiecesHorizontal);
+ tunerBackgroundButtonFrameDrawer->setFillWholeRect(true);
+ mTunerBackgroundPushButton->setFrameBackground(tunerBackgroundButtonFrameDrawer);
+
+ // Connect the button's clicked signal.
+ connect(mTunerBackgroundPushButton, SIGNAL(clicked()), this, SLOT(radioToForeground()));
+ }
+
}
- mInformationAreaOneRowLayout = qobject_cast<QGraphicsWidget *> (documentLoader->findObject(
- KDocmlObjectNameOneRowLayout));
- if (mInformationAreaOneRowLayout) {
- /*
- QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, mInformationAreaOneRowLayout);
- mInformationLonelyRowMarquee = new HbMarqueeItem();
- mInformationLonelyRowMarquee->setObjectName("marquee3");
- HbStyle::setItemName(mInformationLonelyRowMarquee, "marquee3");
- mInformationLonelyRowMarquee->setText(
- "Long text");
- mInformationLonelyRowMarquee->setLoopCount(-1);
- mInformationLonelyRowMarquee->startAnimation();
- HbFontSpec fs(HbFontSpec::Secondary);
- mInformationLonelyRowMarquee->setFontSpec(fs);
- mInformationLonelyRowMarquee->setTextColor(HbColorScheme::color("qtc_hs_list_item_title"));
- mInformationLonelyRowMarquee->setPreferredSize(layout->preferredSize());
- layout->addItem(mInformationLonelyRowMarquee);
- */
- }
-
- mInformationAreaAnimationLayout = qobject_cast<QGraphicsWidget *> (
- documentLoader->findObject(QString(KDocmlObjectNameAnimationLayout)));
- if (mInformationAreaAnimationLayout) {
- }
-
- mInformationFirstRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameFirstRowLabel));
- if (mInformationFirstRowLabel) {
- mInformationFirstRowLabel->setTextColor(HbColorScheme::color("qtc_hs_list_item_title"));
- }
+ // Find layout for control buttons.
+ HbWidget *controlButtonsLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
+ KDocmlObjectNameContolButtonsLayout));
+ if (controlButtonsLayout) {
+ if (frameItem) {
+ // Stack widget's background behind it.
+ frameItem->stackBefore(controlButtonsLayout);
+ }
+
+ // Find power button.
+ mPowerToggleButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
+ KDocmlObjectNameowerToggleButton));
+ if (mPowerToggleButton) {
+ // If power button is lathced type, use this.
+ //mPowerToggleButton->setCheckable(true);
+ changeControlButtonFrameBackground(false, Left, mPowerToggleButton);
+
+ // Use the graphics from resources until release contains proper graphics.
+ mPowerToggleButton->setIcon(HbIcon(":/ui/resource/mono_power.png"));
+ // Connect the button's clicked signal.
+ connect(mPowerToggleButton, SIGNAL(clicked()), this, SLOT(radioToBackground()));
+ }
+
+ // Find previous button.
+ mPreviousPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
+ KDocmlObjectNamePreviousPushButton));
+ if (mPreviousPushButton) {
+ changeControlButtonFrameBackground(false, Center, mPreviousPushButton);
+ // Connect the button's clicked signal.
+ connect(mPreviousPushButton, SIGNAL(clicked()), this, SLOT(previousChannel()));
+ }
- mInformationSecondRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameSecondRowLabel));
- if (mInformationSecondRowLabel) {
- mInformationSecondRowLabel->setTextColor(HbColorScheme::color("qtc_hs_list_item_content"));
- }
-
- mInformationLonelyRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameLonelyRowLabel));
- if (mInformationLonelyRowLabel) {
- mInformationLonelyRowLabel->setTextColor(HbColorScheme::color("qtc_hs_list_item_content"));
- }
-
- mAnimationIcon = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameAnimationIcon));
- if (mAnimationIcon) {
- // Use animation manager to define the frame-by-frame animation.
- HbIconAnimationManager *animationManager = HbIconAnimationManager::global();
-
- // Create animation definition.
- HbIconAnimationDefinition animationDefinition;
- QList<HbIconAnimationDefinition::AnimationFrame> animationFrameList;
-
- HbIconAnimationDefinition::AnimationFrame animationFrame;
- QString animationFrameIconName;
- QString animationFrameIconNamePrefix = "qtg_anim_loading_";
- for (int i = 1; i < 11; i++) {
- animationFrame.duration = 100;
- animationFrameIconName.clear();
- animationFrameIconName.append(animationFrameIconNamePrefix);
- animationFrameIconName.append(animationFrameIconName.number(i));
- animationFrame.iconName = animationFrameIconName;
- animationFrameList.append(animationFrame);
+ // Find next button.
+ mNextPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
+ KDocmlObjectNameNextPushButton));
+ if (mNextPushButton) {
+ changeControlButtonFrameBackground(false, Right, mNextPushButton);
+ // Connect the button's clicked signal.
+ connect(mNextPushButton, SIGNAL(clicked()), this, SLOT(nextChannel()));
}
- animationDefinition.setPlayMode(HbIconAnimationDefinition::Loop);
- animationDefinition.setFrameList(animationFrameList);
- animationManager->addDefinition("animation", animationDefinition);
-
- // Construct an icon using the animation definition.
- HbIcon icon("animation");
-
- mAnimationIcon->setIcon(icon);
}
}
+ // Loader is not needed anymore so it is deleted.
delete documentLoader;
}
/*!
- Slot for grouping events.
+ Slot for closing FM Radio application from power button.
*/
-bool FmRadioHsWidget::eventFilter(QObject */*target*/, QEvent */*event*/)
- {
-// This event filter is used to get events from information area layout and from it's components.
-// Not yet implemented.
-/*
- if (target == mFrequencyLabel) {
- if (event->type() == QEvent::MouseButtonRelease) {
- qDebug() << "MouseButtonRelease";
- return true;
- }
- else if (event->type() == QEvent::MouseButtonPress) {
- qDebug() << "MouseButtonPress";
- return true;
- }
- else if (event->type() == QEvent::KeyPress) {
- qDebug() << "KeyPress";
- return true;
- }
- else {
- return false;
- }
- }
- else {
- // pass the event on to the parent class
- return HbWidget::eventFilter(target, event);
- }
-*/
- return false;
-}
-
-/*!
- Mute FM Radio audio.
- */
-void FmRadioHsWidget::mute()
+void FmRadioHsWidget::closeRadio()
{
- mRadioServiceClient->doControlFmRadioAudio(FmRadioHsWidgetRadioServiceClient::Mute);
- //handleRadioStateChange(QVariant(NotControllingAudio));
-}
-
-/*!
- Unmute FM Radio audio.
- */
-void FmRadioHsWidget::unMute()
-{
- mRadioServiceClient->doControlFmRadioAudio(FmRadioHsWidgetRadioServiceClient::Unmute);
- //handleRadioStateChange(QVariant(ControllingAudio));
+ LOG_SLOT_CALLER;
+ mRadioServiceClient->doCloseFmRadio();
}
/*!
@@ -358,7 +357,9 @@
*/
void FmRadioHsWidget::previousChannel()
{
- mRadioServiceClient->doChangeFmRadioChannel(FmRadioHsWidgetRadioServiceClient::PreviousFavouriteChannel);
+ LOG_SLOT_CALLER;
+ clearRadioInformation();
+ mRadioServiceClient->doChangeFmRadioStation(FmRadioHsWidgetRadioServiceClient::PreviousFavouriteStation);
}
/*!
@@ -366,253 +367,303 @@
*/
void FmRadioHsWidget::nextChannel()
{
- mRadioServiceClient->doChangeFmRadioChannel(FmRadioHsWidgetRadioServiceClient::NextFavouriteChannel);
+ LOG_SLOT_CALLER;
+ clearRadioInformation();
+ mRadioServiceClient->doChangeFmRadioStation(FmRadioHsWidgetRadioServiceClient::NextFavouriteStation);
}
/*!
- Slot for radio button clicked.
+ Slot for bringing the radio application to foreground.
*/
void FmRadioHsWidget::radioToForeground()
{
+ LOG_SLOT_CALLER;
+ // If radio is not running start it to foreground by monitor request.
if (mFmRadioState == NotRunning) {
handleRadioStateChange(QVariant(Starting));
+ //mRadioServiceClient->doPowerOnFmRadio(FmRadioHsWidgetRadioServiceClient::ToForeground);
mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToForeground);
}
else {
+ if (mFmRadioState == Closing) {
+ // Radio is closing but user wants to power it up again.
+ mRadioServiceClient->doPowerOnFmRadio();
+ mRadioServiceClient->stopMonitoring();
+ mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToBackground);
+ handleRadioStateChange(QVariant(Running));
+ }
+ // If radio is running, bring it to the foreground.
mRadioServiceClient->doChangeFmRadioVisibility(
FmRadioHsWidgetRadioServiceClient::ToForeground);
}
}
/*!
- Slot for radio button clicked.
+ Slot for putting the radio application to the background.
*/
void FmRadioHsWidget::radioToBackground()
{
+ LOG_SLOT_CALLER;
+ // If radio is not running start it to background by monitor request.
if (mFmRadioState == NotRunning) {
handleRadioStateChange(QVariant(Starting));
mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToBackground);
}
else if (mFmRadioState == Starting) {
-
+ // Do nothing if radio is starting.
+ }
+ else if (mFmRadioState == Closing) {
+ // Radio is closing but user wants to power it up again.
+ mRadioServiceClient->doPowerOnFmRadio();
+ mRadioServiceClient->stopMonitoring();
+ mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToBackground);
+ handleRadioStateChange(QVariant(Running));
}
else {
+ // If radio is running, put it to the background.
+ // This is little bit useless because the radio is in background if
+ // user is able to click the widget.
mRadioServiceClient->doChangeFmRadioVisibility(
FmRadioHsWidgetRadioServiceClient::ToBackground);
}
}
/*!
- Opening of url to the browser.
-
- /param url Url to be opened.
- */
-bool FmRadioHsWidget::openUrl(QUrl url)
-{
- return QDesktopServices::openUrl(url);
-}
+ Handles changes in FM Radio information.
-/*!
- Handles changes in FM Radio information.
-
/param type Type of changed information.
/param value Information content.
*/
-void FmRadioHsWidget::handleRadioInformationChange(
- int notificationId, QVariant value)
+void FmRadioHsWidget::handleRadioInformationChange(const int notificationId,
+ const QVariant &value)
{
+ LOG_METHOD;
+ LEVEL2(LOG_SLOT_CALLER);
if (!value.isValid()) {
+ // Value is not valid so return.
return;
}
switch ( notificationId ) {
case RadioServiceNotification::FavoriteCount:
+ LEVEL2(LOG("FavoriteCount"));
if (value.canConvert(QVariant::Int)) {
int favoriteCount = value.toInt();
- mIsFavoriteChannels = favoriteCount > 0 ? true : false;
- changeChannelButtonsEnabledState(mIsFavoriteChannels);
+ // If there are favorite stations, enable the next/previous
+ // buttons.
+ mFavoriteStations = favoriteCount > 0 ? true : false;
+ LEVEL2(LOG_FORMAT("favoriteCount: %d, mFavoriteStations: %d",
+ favoriteCount, mFavoriteStations));
+ changeStationButtonsEnabledState(mFavoriteStations);
+ }
+ break;
+
+ case RadioServiceNotification::CurrentIsFavorite:
+ LEVEL2(LOG("CurrentIsFavorite"));
+ if (value.canConvert(QVariant::Bool)) {
+ bool currentIsFavorite = value.toBool();
+ LEVEL2(LOG_FORMAT("currentIsFavorite: %d", currentIsFavorite));
+ // If favorite count is 1 and current station is favorite
+ // disable next/prev buttons.
+ if (currentIsFavorite) {
+ changeStationButtonsEnabledState(false);
+ } else {
+ // Else eneble them.
+ changeStationButtonsEnabledState(true);
+ }
}
break;
case RadioServiceNotification::RadioStatus:
+ LEVEL2(LOG("RadioStatus"));
if (value.canConvert(QVariant::Int)) {
int status = value.toInt();
switch (status) {
case RadioStatus::Playing:
+ LEVEL2(LOG("Playing"));
handleRadioStateChange(QVariant(ControllingAudio));
break;
case RadioStatus::Muted:
+ LEVEL2(LOG("Muted"));
handleRadioStateChange(QVariant(NotControllingAudio));
break;
case RadioStatus::Seeking:
+ LEVEL2(LOG("Seeking"));
handleRadioStateChange(QVariant(Seeking));
break;
case RadioStatus::NoAntenna:
+ LEVEL2(LOG("NoAntenna"));
handleRadioStateChange(QVariant(AntennaNotConnected));
break;
+ case RadioStatus::PoweringOff:
+ LEVEL2(LOG("PoweringOff"));
+ handleRadioStateChange(QVariant(Closing));
+ break;
default:
+ LEVEL2(LOG("default"));
break;
}
}
break;
case RadioServiceNotification::Frequency:
+ LEVEL2(LOG("Frequency"));
if (value.canConvert(QVariant::UInt)) {
const uint frequency = value.toUInt();
- QString freqString;
- freqString.sprintf("%.1f", qreal(frequency) / KFrequencyMultiplier);
+ QString frequencyString;
+ // Format the frequency to human readable text.
+ frequencyString.sprintf("%.1f", qreal(frequency) / FREQUENCY_MULTIPLIER);
+ LEVEL2(LOG_FORMAT("frequency: %s", GETSTRING(frequencyString)));
+ // TODO: Remove comment when localisation is working on device.
+ //frequencyString = hbTrId("txt_rad_list_l1_mhz").arg(freqString);
bool frequencyCleared = false;
+ // If widget has some frequency information and new frequency
+ // differs from that
if (mRadioInformation.contains(KRadioInformationFrequency)
- && mRadioInformation[KRadioInformationFrequency].compare(freqString) != 0) {
+ && mRadioInformation[KRadioInformationFrequency].compare(frequencyString) != 0) {
+ // Clear all infromation from widget because station has changed.
clearRadioInformation();
frequencyCleared = true;
}
- bool frequencyUpdated = updateRadioInformation(KRadioInformationFrequency, freqString);
+ // If widget do not have any frquency information, update it.
+ bool frequencyUpdated = updateRadioInformation(KRadioInformationFrequency, frequencyString);
if (frequencyCleared || frequencyUpdated) {
+ // Information changed, update the UI.
radioInformationChanged();
}
}
break;
case RadioServiceNotification::Name:
+ LEVEL2(LOG("Name"));
if (value.canConvert(QVariant::String)) {
if (updateRadioInformation(KRadioInformationStationName, value.toString())) {
+ LEVEL2(LOG_FORMAT("name: %s", GETSTRING(value.toString())));
radioInformationChanged();
}
}
break;
case RadioServiceNotification::Genre:
+ LEVEL2(LOG("Genre"));
if (value.canConvert(QVariant::String)) {
if (updateRadioInformation(KRadioInformationPty, value.toString())) {
+ LEVEL2(LOG_FORMAT("genre: %s", GETSTRING(value.toString())));
radioInformationChanged();
}
}
break;
case RadioServiceNotification::RadioText:
+ LEVEL2(LOG("RadioText"));
if (value.canConvert(QVariant::String)) {
if (updateRadioInformation(KRadioInformationRt, value.toString())) {
- radioInformationChanged();
- }
- }
- break;
-
- case RadioServiceNotification::HomePage:
- if (value.canConvert(QVariant::String)) {
- if (updateRadioInformation(KRadioInformationHomePage, value.toString())) {
+ LEVEL2(LOG_FORMAT("radio text: %s", GETSTRING(value.toString())));
radioInformationChanged();
}
}
break;
- case RadioServiceNotification::Song:
+ case RadioServiceNotification::DynamicPS:
+ LOG("DynamicPS");
if (value.canConvert(QVariant::String)) {
- if (updateRadioInformation(KRadioInformationSong, value.toString())) {
+ if (updateRadioInformation(KRadioInformationDynamicPsName, value.toString())) {
+ LEVEL2(LOG_FORMAT("dynamicPS: %s", GETSTRING(value.toString())));
radioInformationChanged();
}
}
break;
-
-/* case FmRadioHsWidgetRadioServiceClient::InformationTypeCallSign:
- if (updateRadioInformation(KRadioInformationCallSign, informationText)) {
-
- }
- break;
-*/
-/* case FmRadioHsWidgetRadioServiceClient::InformationTypeDynamicPsName:
- if (updateRadioInformation(KRadioInformationDynamicPsName,
- informationText)) {
-
- }
- break;
- */
-
default:
+ LOG("default");
break;
}
}
/*!
Check if the the radio information is changed. If it is changed update it.
-
- /param informationType Type of the information.
+
+ /param informationType Type of the information.
/param information Information text.
-
+
/return bool If information is updated, return true. Return false otherwise.
*/
-bool FmRadioHsWidget::updateRadioInformation(const QString informationType, QString information)
+bool FmRadioHsWidget::updateRadioInformation(const QString &informationType,
+ const QString &information)
{
- // If hash contains this type
+ LOG_METHOD_RET("%d");
+ // If hash contains this type of information.
if (mRadioInformation.contains(informationType)) {
- // If new information is empty
+ // If new information is empty.
if (information.isEmpty()) {
- // Remove it from the hash
+ // Remove old information from the hash.
+ LEVEL2(LOG_FORMAT("informationType: %s removed", GETSTRING(informationType)));
mRadioInformation.remove(informationType);
- // Return true to indicate the change
+ // Return true to indicate the change.
return true;
}
- // If new information differs from the old one
+ // If new information differs from the old one.
if (mRadioInformation[informationType].compare(information) != 0) {
- // Update the information
+ // Update the information.
+ LEVEL2(LOG_FORMAT("informationType: %s = %s", GETSTRING(informationType), GETSTRING(information)));
mRadioInformation[informationType] = information;
- // And return true to indicate the change
+ // And return true to indicate the change.
return true;
}
- } else { // Hash do not contain the information
- // If new information is not empty
+ } else { // Hash do not contain this type of information.
+ // If new information is not empty.
if (!information.isEmpty()) {
- // Add it to the hash
+ // Add it to the hash.
+ LEVEL2(LOG_FORMAT("informationType: %s = %s", GETSTRING(informationType), GETSTRING(information)));
mRadioInformation[informationType] = information;
- // Return true to indicate the change
+ // Return true to indicate the change.
return true;
}
}
- // Return false to indicate that nothing changed
+ // Return false to indicate that nothing changed.
return false;
}
/*!
- Formatting radio information texts after change.
+ Formatting radio information texts after a change.
*/
void FmRadioHsWidget::radioInformationChanged()
{
- mRadioInformationFirstRow = "";
- mRadioInformationSecondRow = "";
+ LOG_METHOD_ENTER;
+ // Clear the rows.
+ mRadioInformationFirstRow.clear();
+ mRadioInformationSecondRow.clear();
- // Lets formulate the first row, first station name
+ // First row contains station name.
if (mRadioInformation.contains(KRadioInformationStationName)) {
mRadioInformationFirstRow.append(mRadioInformation.value(KRadioInformationStationName));
- }
- // Second call sign
- if (mRadioInformation.contains(KRadioInformationCallSign)) {
- mRadioInformationFirstRow.append(" " + mRadioInformation.value(KRadioInformationCallSign));
+ } else if (mRadioInformation.contains(KRadioInformationFrequency)) {
+ // Or frequency.
+ mRadioInformationFirstRow.append(mRadioInformation.value(KRadioInformationFrequency));
}
- // Third frequency
- if (mRadioInformation.contains(KRadioInformationFrequency)) {
- mRadioInformationFirstRow.append(" " + mRadioInformation.value(KRadioInformationFrequency)
- + " " + KMhzText);
- }
- // Second row of information contains first rt
+ LEVEL2(LOG_FORMAT("mRadioInformationFirstRow: %s", GETSTRING(mRadioInformationFirstRow)));
+
+ // Second row of information contains radio text.
if (mRadioInformation.contains(KRadioInformationRt)) {
mRadioInformationSecondRow.append(mRadioInformation.value(KRadioInformationRt));
- }
- // Second is dynamic ps name
- if (mRadioInformation.contains(KRadioInformationDynamicPsName)) {
- mRadioInformationSecondRow.append(" " + mRadioInformation.value(
+ } else if (mRadioInformation.contains(KRadioInformationDynamicPsName)) {
+ // Or Dynamic PS name.
+ mRadioInformationSecondRow.append(mRadioInformation.value(
KRadioInformationDynamicPsName));
+ } else if (mRadioInformation.contains(KRadioInformationPty)) {
+ // Or PTY.
+ mRadioInformationSecondRow.append(mRadioInformation.value(KRadioInformationPty));
}
- // Third is pty
- if (mRadioInformation.contains(KRadioInformationPty)) {
- mRadioInformationSecondRow.append(" " + mRadioInformation.value(KRadioInformationPty));
- }
-
+ LEVEL2(LOG_FORMAT("mRadioInformationSecondRow: %s", GETSTRING(mRadioInformationSecondRow)));
+
+ // If second row is empty.
if (mRadioInformationSecondRow.isEmpty()) {
+ // Show only the lonely row.
mInformationLonelyRowLabel->setPlainText(mRadioInformationFirstRow);
changeInformationAreaLayout(OneRow);
}
else {
+ // Else display both rows.
mInformationFirstRowLabel->setPlainText(mRadioInformationFirstRow);
mInformationSecondRowLabel->setPlainText(mRadioInformationSecondRow);
changeInformationAreaLayout(TwoRows);
@@ -620,306 +671,267 @@
}
/*!
- Clears the radio station information. For example, when the channel is
+ Clears the radio station information. For example, when the station is
changed, old information should be cleared.
*/
void FmRadioHsWidget::clearRadioInformation()
{
+ LOG_METHOD_ENTER;
if (!mRadioInformation.isEmpty()) {
+ LEVEL2(LOG("clear radioInformation"));
mRadioInformation.clear();
}
}
/*!
Handles changes in FM Radio state.
-
- /param value Information content.
+
+ /param value New state of the radio application.
*/
-void FmRadioHsWidget::handleRadioStateChange(QVariant value)
+void FmRadioHsWidget::handleRadioStateChange(const QVariant &value)
{
+ LOG_METHOD;
int state;
if (value.canConvert(QVariant::Int)) {
state = value.toInt();
} else {
return;
}
-
+
if (state == mFmRadioState) {
// State did not change, so return.
return;
}
-
+
switch (state) {
case Undefined:
- // TODO: Some error occured because we do not have the state information. Handle this.
+ LEVEL2(LOG("Undefined"));
+ // Something went wrong. Widget should not be in this state after onInitialize().
mFmRadioState = Undefined;
break;
case NotRunning:
+ LEVEL2(LOG("NotRunning"));
mFmRadioState = NotRunning;
mRadioServiceClient->stopMonitoring();
- //changeControlButtonState(ChannelsDisabledPlay);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- changePlayButtonState(PlayEnabled);
- mIsFavoriteChannels = false;
- changeChannelButtonsEnabledState(false);
+ changePowerButtonOn(false);
+ mFavoriteStations = false;
+ changeStationButtonsEnabledState(false);
+ clearRadioInformation();
mInformationFirstRowLabel->setPlainText("");
mInformationSecondRowLabel->setPlainText("");
- mInformationLonelyRowLabel->setPlainText(KFmRadioText);
+ mInformationLonelyRowLabel->setPlainText(hbTrId("txt_rad_list_fm_radio"));
changeInformationAreaLayout(OneRow);
break;
case Starting:
+ LEVEL2(LOG("Starting"));
mFmRadioState = Starting;
- //changeControlButtonState(ChannelsDisabledStop);
- changePlayButtonState(StopDisabled);
- // TODO: What should the stop button do? Should it close the radio?
- changeChannelButtonsEnabledState(false);
+ changePowerButtonOn(true);
+ changeStationButtonsEnabledState(false);
changeInformationAreaLayout(Animation);
+ // This timer is workaround to recover from situation where radio is
+ // started from widget but user answers no to the offline start dialog.
+ // Stop timer if it is running.
+ stopRadioStartingCancelTimer();
+ // Set timer as single shot.
+ mRadioStartingCancelTimer->setSingleShot(true);
+ // Connect timeout.
+ connect(mRadioStartingCancelTimer, SIGNAL(timeout()), this,
+ SLOT(cancelRadioStartingState()));
+ // Start to timeout after delay.
+ mRadioStartingCancelTimer->start(KRadioStartingStateCancelDelay);
break;
case Running:
+ LEVEL2(LOG("Running"));
mFmRadioState = Running;
- mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::DoNotChange);
- //changeControlButtonState(ChannelsEnabledStop);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- changePlayButtonState(StopEnabled);
- changeChannelButtonsEnabledState(mIsFavoriteChannels);
+ // Stop timer if it is running because radio is now running.
+ stopRadioStartingCancelTimer();
+ mRadioServiceClient->startMonitoring(
+ FmRadioHsWidgetRadioServiceClient::DoNotChange);
+ changePowerButtonOn(true);
+ changeStationButtonsEnabledState(mFavoriteStations);
changeInformationAreaLayout(OneRow);
break;
case ControllingAudio:
+ LEVEL2(LOG("ControllingAudio"));
mFmRadioState = ControllingAudio;
- //changeControlButtonState(ChannelsEnabledStop);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- changePlayButtonState(StopEnabled);
- changeChannelButtonsEnabledState(mIsFavoriteChannels);
+ changeStationButtonsEnabledState(mFavoriteStations);
radioInformationChanged();
break;
case NotControllingAudio:
+ LEVEL2(LOG("NotControllingAudio"));
mFmRadioState = NotControllingAudio;
- //changeControlButtonState(ChannelsEnabledPlay);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- changePlayButtonState(PlayEnabled);
- changeChannelButtonsEnabledState(mIsFavoriteChannels);
+ changeStationButtonsEnabledState(mFavoriteStations);
radioInformationChanged();
break;
case Seeking:
+ LEVEL2(LOG("Seeking"));
mFmRadioState = Seeking;
- //changeControlButtonState(AllDisabledStop);
- changePlayButtonState(StopDisabled);
- changeChannelButtonsEnabledState(false);
+ changeStationButtonsEnabledState(false);
changeInformationAreaLayout(Animation);
break;
case AntennaNotConnected:
+ LEVEL2(LOG("AntennaNotConnected"));
mFmRadioState = AntennaNotConnected;
- //changeControlButtonState(AllDisabledPlay);
- changePlayButtonState(StopDisabled);
- changeChannelButtonsEnabledState(false);
+ changeStationButtonsEnabledState(false);
mInformationFirstRowLabel->setPlainText("");
mInformationSecondRowLabel->setPlainText("");
- mInformationLonelyRowLabel->setPlainText(KConnectHeadsetText);
+ mInformationLonelyRowLabel->setPlainText(hbTrId("txt_rad_info_connect_wired_headset"));
+ changeInformationAreaLayout(OneRow);
+ break;
+ case Closing:
+ LEVEL2(LOG("Closing"));
+ mFmRadioState = Closing;
+ changePowerButtonOn(false);
+ changeStationButtonsEnabledState(false);
+ clearRadioInformation();
+ mInformationFirstRowLabel->setPlainText("");
+ mInformationSecondRowLabel->setPlainText("");
+ mInformationLonelyRowLabel->setPlainText(hbTrId("txt_rad_list_fm_radio"));
changeInformationAreaLayout(OneRow);
break;
default:
- break;
- }
-}
-
-/*!
- Changes visible layout of information area.
-
- /param InformationAreaLayout The layout to switch visible.
- */
-void FmRadioHsWidget::changeInformationAreaLayout(InformationAreaLayout layout)
-{
- switch (layout) {
- case OneRow:
- mInformationAreaOneRowLayout->show();
- ((QGraphicsWidget*) mInformationAreaTwoRowsLayout)->hide();
- mInformationAreaAnimationLayout->hide();
- break;
- case TwoRows:
- mInformationAreaOneRowLayout->hide();
- ((QGraphicsWidget*) mInformationAreaTwoRowsLayout)->show();
- mInformationAreaAnimationLayout->hide();
- break;
- case Animation:
- mInformationAreaOneRowLayout->hide();
- ((QGraphicsWidget*) mInformationAreaTwoRowsLayout)->hide();
- mInformationAreaAnimationLayout->show();
- break;
- default:
+ LOG("default");
break;
}
}
/*!
- Changes state of the control buttons.
-
- /param ControlButtonState State of the control buttons.
+ Changes visible widgets of information area stacked layout.
+
+ /param InformationAreaLayout The layout to switch visible.
*/
-void FmRadioHsWidget::changeControlButtonState(ControlButtonState buttonState)
+void FmRadioHsWidget::changeInformationAreaLayout(const InformationAreaLayout layout)
{
- QString iconName;
- switch (buttonState) {
- case AllDisabledPlay:
- changeControlButtonFrameBackground(false, Left, mPreviousPushButton);
- iconName.append("qtg_mono_play");
- mPlayPushButton->setIcon(HbIcon(iconName));
- changeControlButtonFrameBackground(false, Center, mPlayPushButton);
- changeControlButtonFrameBackground(false, Right, mNextPushButton);
- break;
- case AllDisabledStop:
- changeControlButtonFrameBackground(false, Left, mPreviousPushButton);
- iconName.append("qtg_mono_stop");
- mPlayPushButton->setIcon(HbIcon(iconName));
- changeControlButtonFrameBackground(false, Center, mPlayPushButton);
- changeControlButtonFrameBackground(false, Right, mNextPushButton);
+ LOG_METHOD;
+ switch (layout) {
+ case OneRow:
+ LEVEL2(LOG("OneRow"));
+ mInformationLonelyRowLabel->show();
+ mInformationAreaTwoRowsLayout->hide();
+ mAnimationIcon->hide();
break;
- case ChannelsDisabledPlay:
- changeControlButtonFrameBackground(false, Left, mPreviousPushButton);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- iconName.append("qtg_mono_play");
- mPlayPushButton->setIcon(HbIcon(iconName));
- changeControlButtonFrameBackground(true, Center, mPlayPushButton);
- changeControlButtonFrameBackground(false, Right, mNextPushButton);
- break;
- case ChannelsDisabledStop:
- changeControlButtonFrameBackground(false, Left, mPreviousPushButton);
- iconName.append("qtg_mono_stop");
- mPlayPushButton->setIcon(HbIcon(iconName));
- changeControlButtonFrameBackground(true, Center, mPlayPushButton);
- changeControlButtonFrameBackground(false, Right, mNextPushButton);
+ case TwoRows:
+ LEVEL2(LOG("TwoRows"));
+ mInformationLonelyRowLabel->hide();
+ mInformationAreaTwoRowsLayout->show();
+ mAnimationIcon->hide();
break;
- case ChannelsEnabledPlay:
- changeControlButtonFrameBackground(true, Left, mPreviousPushButton);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- iconName.append("qtg_mono_play");
- mPlayPushButton->setIcon(HbIcon(iconName));
- changeControlButtonFrameBackground(true, Center, mPlayPushButton);
- changeControlButtonFrameBackground(true, Right, mNextPushButton);
- break;
- case ChannelsEnabledStop:
- changeControlButtonFrameBackground(true, Left, mPreviousPushButton);
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- QObject::disconnect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(unMute()));
- QObject::connect(mPlayPushButton, SIGNAL(clicked()), this,
- SLOT(mute()));
- iconName.append("qtg_mono_stop");
- mPlayPushButton->setIcon(HbIcon(iconName));
- changeControlButtonFrameBackground(true, Center, mPlayPushButton);
- changeControlButtonFrameBackground(true, Right, mNextPushButton);
+ case Animation:
+ LEVEL2(LOG("Animation"));
+ mInformationLonelyRowLabel->hide();
+ mInformationAreaTwoRowsLayout->hide();
+ mAnimationIcon->show();
break;
default:
+ LOG("default");
break;
}
}
/*!
- Changes enabled state of channel buttons.
-
+ Changes state of power button.
+
*/
-void FmRadioHsWidget::changePlayButtonState(PlayButtonState buttonState)
+void FmRadioHsWidget::changePowerButtonOn(const bool isPowerOn)
{
+ LOG_METHOD;
QString iconName;
- bool enabled = false;
- switch (buttonState) {
- case PlayDisabled:
- iconName.append("qtg_mono_play");
- mPlayPushButton->setIcon(HbIcon(iconName));
- enabled = false;
- break;
- case PlayEnabled:
- iconName.append("qtg_mono_play");
- mPlayPushButton->setIcon(HbIcon(iconName));
- enabled = true;
- break;
- case StopDisabled:
- iconName.append("qtg_mono_stop");
- mPlayPushButton->setIcon(HbIcon(iconName));
- enabled = false;
- break;
- case StopEnabled:
- iconName.append("qtg_mono_stop");
- mPlayPushButton->setIcon(HbIcon(iconName));
- enabled = true;
- break;
- default:
- break;
+ if (isPowerOn) {
+ LEVEL2(LOG("Power on"));
+ // Change icon to reflect power on state.
+ iconName.append("qtg_mono_power");
+ mPowerToggleButton->setIcon(HbIcon(":/ui/resource/mono_power.png"));
+ mPowerToggleButton->setText("Off");
+ // Connect clicked to closeRadio slot.
+ disconnect(mPowerToggleButton, SIGNAL(clicked()), this,
+ SLOT(radioToBackground()));
+ connect(mPowerToggleButton, SIGNAL(clicked()), this,
+ SLOT(closeRadio()));
+ } else {
+ LEVEL2(LOG("Power off"));
+ // Change icon to reflect power off state.
+ iconName.append("qtg_mono_power");
+ mPowerToggleButton->setIcon(HbIcon(":/ui/resource/mono_power.png"));
+ mPowerToggleButton->setText("On");
+ // Connect clicked to radioToBackground slot.
+ disconnect(mPowerToggleButton, SIGNAL(clicked()), this,
+ SLOT(closeRadio()));
+ connect(mPowerToggleButton, SIGNAL(clicked()), this,
+ SLOT(radioToBackground()));
}
- changeControlButtonFrameBackground(enabled, Center, mPlayPushButton);
+ changeControlButtonFrameBackground(true, Left, mPowerToggleButton);
}
/*!
- Changes enabled state of channel buttons.
-
+ Changes enabled state of station buttons.
+
*/
-void FmRadioHsWidget::changeChannelButtonsEnabledState(bool enabled)
+void FmRadioHsWidget::changeStationButtonsEnabledState(const bool enabled)
{
- changeControlButtonFrameBackground(enabled, Left, mPreviousPushButton);
+ LOG_METHOD_ENTER;
+ changeControlButtonFrameBackground(enabled, Center, mPreviousPushButton);
changeControlButtonFrameBackground(enabled, Right, mNextPushButton);
}
/*!
Changes background of control button.
-
+
/param enabled Is button enabled or disabled.
/param position Position of the control button in button group.
/param button The button to change the background.
*/
-void FmRadioHsWidget::changeControlButtonFrameBackground(bool enabled,
- ControlButtonPosition position, HbPushButton *button)
+void FmRadioHsWidget::changeControlButtonFrameBackground(const bool enabled,
+ const ControlButtonPosition position, HbPushButton *button)
{
+ LOG_METHOD_ENTER;
QString frameGraphicsName("qtg_fr_hsbutton_");
if (enabled) {
frameGraphicsName.append("normal");
} else {
frameGraphicsName.append("disabled");
}
+ LEVEL2(LOG_FORMAT("frameGraphicsName: %s", GETSTRING(frameGraphicsName)));
HbFrameDrawer *frameDrawer = new HbFrameDrawer(frameGraphicsName,
HbFrameDrawer::ThreePiecesHorizontal);
switch (position) {
case Left:
+ LEVEL2(LOG("Left"));
frameDrawer->setFileNameSuffixList(QStringList() << "_l" << "_c" << "_cr");
break;
case Center:
+ LEVEL2(LOG("Center"));
frameDrawer->setFileNameSuffixList(QStringList() << "_cl" << "_c" << "_cr");
break;
case Right:
+ LEVEL2(LOG("Right"));
frameDrawer->setFileNameSuffixList(QStringList() << "_cl" << "_c" << "_r");
break;
default:
+ LOG("default");
break;
}
button->setFrameBackground(frameDrawer);
button->setEnabled(enabled);
}
+
+/*!
+ Radio did not start on time. Let's reset the widget's state.
+
+ */
+void FmRadioHsWidget::cancelRadioStartingState()
+{
+ LOG_SLOT_CALLER;
+ handleRadioStateChange(QVariant(NotRunning));
+}
+
+/*!
+ Stop the timer canceling radio starting state.
+
+ */
+void FmRadioHsWidget::stopRadioStartingCancelTimer()
+{
+ LOG_METHOD_ENTER;
+ if (mRadioStartingCancelTimer->isActive()) {
+ mRadioStartingCancelTimer->stop();
+ }
+}
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprocesshandler.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +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: FM Radio widget process handler
-*
-*/
-
-// System includes
-
-// User includes
-#include "fmradiohswidgetprocesshandler.h"
-#include "fmradiohswidget.h"
-
-/*!
- Constructor
- */
-FmRadioHsWidgetProcessHandler::FmRadioHsWidgetProcessHandler(QObject *parent) :
- QObject(parent), mProcess(new QProcess(this))
-{
- QObject::connect(mProcess, SIGNAL(stateChanged(QProcess::ProcessState)),
- this, SLOT(handleStateChange(QProcess::ProcessState)));
- QObject::connect(mProcess, SIGNAL(error(QProcess::ProcessError error)),
- this, SLOT(handleError(QProcess::ProcessError error)));
- QObject::connect(mProcess,
- SIGNAL(finished(int exitCode, QProcess::ExitStatus exitStatus)),
- this,
- SLOT(handleFinish(int exitCode, QProcess::ExitStatus exitStatus)));
-}
-
-/*!
- Destructor
- */
-FmRadioHsWidgetProcessHandler::~FmRadioHsWidgetProcessHandler()
-{
-}
-
-/*!
- Launching of FM Radio application process.
- */
-void FmRadioHsWidgetProcessHandler::startFmRadioApplication()
-{
- if (mProcess->pid() == qint64(0)) {
- QString executablePath = KRadioExecutablePath;
- QStringList arguments;
- arguments << KRadioExecutableArguments;
- mProcess->start(executablePath, arguments);
- }
-}
-
-/*!
- Handles state change notifications from FM Radio application process.
- */
-void FmRadioHsWidgetProcessHandler::handleStateChange(
- QProcess::ProcessState state)
-{
- switch (state) {
- case QProcess::NotRunning:
- emit fmRadioApplicationStateChanged(QVariant(FmRadioHsWidget::NotRunning));
- break;
- case QProcess::Starting:
- emit fmRadioApplicationStateChanged(QVariant(FmRadioHsWidget::Starting));
- break;
- case QProcess::Running:
- emit fmRadioApplicationStateChanged(QVariant(FmRadioHsWidget::Running));
- break;
- default:
- break;
- }
-}
-
-/*!
- Handles error notifications from FM Radio application process.
- */
-void FmRadioHsWidgetProcessHandler::handleError(
- QProcess::ProcessError error)
-{
- switch (error) {
- case QProcess::FailedToStart:
- break;
- case QProcess::Crashed:
- break;
- case QProcess::Timedout:
- break;
- case QProcess::WriteError:
- break;
- case QProcess::ReadError:
- break;
- case QProcess::UnknownError:
- break;
- default:
- break;
- }
-}
-
-/*!
- Handles finished process notifications from FM Radio application process.
- */
-void FmRadioHsWidgetProcessHandler::handleFinish(int /*exitCode*/,
- QProcess::ExitStatus exitStatus)
-{
- switch (exitStatus) {
- case QProcess::NormalExit:
- break;
- case QProcess::CrashExit:
- break;
- default:
- break;
- }
-}
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprofilereader.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprofilereader.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -16,16 +16,17 @@
*/
// System includes
+#include <QDateTime>
#include <ProfileEngineSDKCRKeys.h>
#include "xqsettingsmanager.h"
#include "xqsettingskey.h"
#include "xqpublishandsubscribeutils.h"
-#include <QDateTime>
// User includes
#include "fmradiohswidgetprofilereader.h"
#include "fmradiohswidget.h"
#include "radioservicedef.h"
+#include "radiologger.h"
/*!
Constructor
@@ -35,23 +36,11 @@
mSettingsManager(new XQSettingsManager(this)),
mRadioStatus(-1)
{
-/*
- // Monitors devices profile.
- XQSettingsKey profileKey(XQSettingsKey::TargetCentralRepository,
- KCRUidProfileEngine.iUid, KProEngActiveProfile);
- mSettingsManager->startMonitoring(profileKey);
- currentProfileStatus(mSettingsManager->readItemValue(profileKey));
-
+ LOG_METHOD;
connect(mSettingsManager, SIGNAL(itemDeleted(XQSettingsKey)), this,
SLOT(itemDeleted(XQSettingsKey)));
connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
this, SLOT(handleChanges(XQSettingsKey, QVariant)));
-*/
- startMonitoringRadioRunningStatus();
- bool d = connect(mSettingsManager, SIGNAL(itemDeleted(XQSettingsKey)), this,
- SLOT(itemDeleted(XQSettingsKey)));
- bool h = connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
- this, SLOT(handleRadioRunningChanges(XQSettingsKey, QVariant)));
}
/*!
@@ -59,22 +48,26 @@
*/
FmRadioHsWidgetProfileReader::~FmRadioHsWidgetProfileReader()
{
+ LOG_METHOD;
}
/*!
- Handling of deletion of listened P&S key.
+ Handling of deletion of listened keys.
\param key Deleted key.
*/
-void FmRadioHsWidgetProfileReader::itemDeleted(const XQSettingsKey& key)
+void FmRadioHsWidgetProfileReader::itemDeleted(const XQSettingsKey &key)
{
+ LOG_METHOD;
+ // Profile information will be used for offline query.
/*
if (key.uid() == KCRUidProfileEngine.iUid && key.key()
== KProEngActiveProfile) {
}
*/
if (key.uid() == KRadioPSUid && key.key() == KRadioStartupKey) {
+ LOG("KRadioStartupKey deleted");
startMonitoringRadioRunningStatus();
}
}
@@ -86,83 +79,75 @@
\param key Changed key.
\param value Value of changed key.
*/
-/*
-void FmRadioHsWidgetProfileReader::handleChanges(const XQSettingsKey& key,
+void FmRadioHsWidgetProfileReader::handleChanges(const XQSettingsKey &key,
const QVariant& value)
-{
+{
+ LOG_SLOT_CALLER;
+
+ // Profile information will be used for offline query.
+ /*
if (key.uid() == KCRUidProfileEngine.iUid && key.key()
== KProEngActiveProfile) {
currentProfileStatus(value);
}
+ */
+
+ if (key.uid() == KRadioPSUid && key.key()
+ == KRadioStartupKey) {
+ LOG("KRadioStartupKey changed");
+ currentRadioRunningStatus(value);
+ }
}
-*/
+
/*!
Handling changes in profile information.
- \param value Originally information is of int type. Valid values after
- conversion are described by KProEngActiveProfile in ProfileEngineSDKCRKeys.h.
+ \param value
*/
+/*
void FmRadioHsWidgetProfileReader::currentProfileStatus(QVariant value)
{
if (value.canConvert(QVariant::Int)) {
emit profileChanged(value.toInt());
}
}
+*/
/*!
- Notifications from settings manager are handled and routed to appropriate
- private slots.
-
- \param key Changed key.
- \param value Value of changed key.
+ Handling changes in radio running P&S key.
+
+ \param value is int representation of time in seconds when radio was started.
*/
-void FmRadioHsWidgetProfileReader::handleRadioRunningChanges(const XQSettingsKey& key,
- const QVariant& value)
+void FmRadioHsWidgetProfileReader::currentRadioRunningStatus(const QVariant &value)
{
- if (key.uid() == KRadioPSUid && key.key()
- == KRadioStartupKey) {
- currentRadioRunningStatus(value);
- }
-}
-
-/*!
- Handling changes in profile information.
-
- \param value Originally information is of int type. Valid values after
- conversion are described by KProEngActiveProfile in ProfileEngineSDKCRKeys.h.
- */
-void FmRadioHsWidgetProfileReader::currentRadioRunningStatus(QVariant value)
-{
+ LOG_METHOD;
if (value.isValid()) {
if (value.canConvert(QVariant::Int)) {
mRadioStatus = value.toInt();
+ // Emit that radio is running.
QVariant state(FmRadioHsWidget::Running);
emit radioRunning(state);
}
} else {
mRadioStatus = -1;
+ // Emit that radio is not running.
QVariant state(FmRadioHsWidget::NotRunning);
emit radioRunning(state);
}
}
-QVariant FmRadioHsWidgetProfileReader::radioStatus()
-{
- QVariant state;
- if (mRadioStatus != -1) {
- state = QVariant(FmRadioHsWidget::Running);
- return state;
- } else {
- state = QVariant(FmRadioHsWidget::NotRunning);
- return state;
- }
-}
-
+/*!
+ Start monitoring radio P&S key.
+
+ */
void FmRadioHsWidgetProfileReader::startMonitoringRadioRunningStatus()
{
+ LOG_METHOD;
XQSettingsKey radioRunningKey(XQSettingsKey::TargetPublishAndSubscribe, KRadioPSUid,
KRadioStartupKey);
- bool a = mSettingsManager->startMonitoring(radioRunningKey);
+ // Start monitoring.
+ mSettingsManager->startMonitoring(radioRunningKey);
+ // Read current value.
currentRadioRunningStatus(mSettingsManager->readItemValue(radioRunningKey));
}
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetradioserviceclient.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetradioserviceclient.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -23,6 +23,7 @@
#include "fmradiohswidget.h"
#include "radioservicedef.h"
#include "radionotificationdata.h"
+#include "radiologger.h"
/*!
Constructor
@@ -30,10 +31,11 @@
FmRadioHsWidgetRadioServiceClient::FmRadioHsWidgetRadioServiceClient(QObject *parent) :
QObject(parent),
mRequestPending(false),
- mRadioMonitorRequest(0),
- mRadioControlRequest(0),
+ mRadioMonitorRequest(NULL),
+ mRadioControlRequest(NULL),
mDataInitialized(false)
{
+ LOG_METHOD;
}
/*!
@@ -41,112 +43,83 @@
*/
FmRadioHsWidgetRadioServiceClient::~FmRadioHsWidgetRadioServiceClient()
{
+ LOG_METHOD;
stopMonitoring();
}
/*!
- * Initialize all data
+ Close FM Radio application.
+
*/
-void FmRadioHsWidgetRadioServiceClient::init()
+void FmRadioHsWidgetRadioServiceClient::doCloseFmRadio()
{
- const bool radioIsRunning = false; //TODO: Find out if radio is running. Use P&S key for now
- if ( radioIsRunning ) {
- //startMonitoring();
- }
+ LOG_METHOD;
+ QVariant commandArgument;
+ commandArgument.setValue(static_cast<int>(RadioServiceCommand::PowerOff));
+ doSendControlRequest(commandArgument, DoNotChange);
+}
+
+/*!
+ Power on FM Radio application.
+ This is used only when radio is in Closing state. This merely cancels the
+ radio power off delay and unmutes the audio. Currently the starting of radio
+ is done with startMonitoring().
+ */
+void FmRadioHsWidgetRadioServiceClient::doPowerOnFmRadio()
+{
+ LOG_METHOD;
+ QVariant commandArgument;
+ commandArgument.setValue(static_cast<int>(RadioServiceCommand::PowerOn));
+ doSendControlRequest(commandArgument, DoNotChange);
}
/*!
- Starting of FM Radio.
-
- /param startupState
- */
-/*
-void FmRadioHsWidgetRadioServiceClient::doStartFmRadio(FmRadioStartupState startupState)
-{
- if (!mRadioControlRequest) {
- createControlServiceRequest();
- }
-
- QVariant commandArgument;
- switch (startupState) {
- case StartForeground:
- // TODO: Include header and remove comment.
- commandArgument.setValue(*//*RadioServiceCommand::Foreground*/ //6);
-/* break;
- case StartBackground:
- // TODO: Include header and remove comment.
- commandArgument.setValue(*//*RadioServiceCommand::Background*/ //7);
-/* break;
- default:
- break;
- }
- QList<QVariant> arguments;
- arguments.append(commandArgument);
- mRadioControlRequest->setArguments(arguments);
-
- bool res = mRadioControlRequest->send();
-}
-*/
-/*!
Bring FM Radio to foreground.
*/
-void FmRadioHsWidgetRadioServiceClient::doChangeFmRadioVisibility(FmRadioVisibilty visibility)
+void FmRadioHsWidgetRadioServiceClient::doChangeFmRadioVisibility(
+ const FmRadioVisibilty visibility)
{
+ LOG_METHOD;
QVariant commandArgument;
switch (visibility) {
case ToForeground:
- commandArgument.setValue((int) RadioServiceCommand::Foreground);
+ LOG("ToForeground");
+ commandArgument.setValue(static_cast<int>(RadioServiceCommand::Foreground));
break;
case ToBackground:
- commandArgument.setValue((int) RadioServiceCommand::Background);
+ LOG("ToBackground");
+ commandArgument.setValue(static_cast<int>(RadioServiceCommand::Background));
case DoNotChange:
default:
+ LOG("DoNotChange or default");
break;
}
doSendControlRequest(commandArgument, visibility);
}
/*!
- Changing of FM Radio channel.
+ Changing of FM Radio station.
/param command Command to execute.
*/
-void FmRadioHsWidgetRadioServiceClient::doChangeFmRadioChannel(
- FmRadioChannelChangeCommand command)
+void FmRadioHsWidgetRadioServiceClient::doChangeFmRadioStation(
+ const FmRadioStationChangeCommand command)
{
+ LOG_METHOD;
QVariant commandArgument;
switch (command) {
- case PreviousFavouriteChannel:
- commandArgument.setValue((int) RadioServiceCommand::Previous);
+ case PreviousFavouriteStation:
+ LOG("PreviousFavouriteChannel");
+ commandArgument.setValue(static_cast<int>(RadioServiceCommand::Previous));
break;
- case NextFavouriteChannel:
- commandArgument.setValue((int) RadioServiceCommand::Next);
+ case NextFavouriteStation:
+ LOG("NextFavouriteChannel");
+ commandArgument.setValue(static_cast<int>(RadioServiceCommand::Next));
break;
default:
- break;
- }
- doSendControlRequest(commandArgument, DoNotChange);
-}
-
-/*!
- Changing of FM Radio channel.
-
- /param command Command to execute.
- */
-void FmRadioHsWidgetRadioServiceClient::doControlFmRadioAudio(
- FmRadioAudioControlCommand command)
-{
- QVariant commandArgument;
- switch (command) {
- case Mute:
- commandArgument.setValue((int) RadioServiceCommand::Pause);
- break;
- case Unmute:
- commandArgument.setValue((int) RadioServiceCommand::Play);
- break;
- default:
+ LOG("default");
break;
}
doSendControlRequest(commandArgument, DoNotChange);
@@ -155,38 +128,47 @@
/*!
Start FM Radio information listening.
*/
-void FmRadioHsWidgetRadioServiceClient::doSendControlRequest(QVariant &argument,
- FmRadioVisibilty visibility)
+void FmRadioHsWidgetRadioServiceClient::doSendControlRequest(
+ const QVariant &argument, const FmRadioVisibilty visibility)
{
+ LOG_METHOD;
+ if (!argument.isValid()) {
+ return;
+ }
+
+ // If there is not mRadioControlRequest already.
if (!mRadioControlRequest) {
+ // Create it.
createControlServiceRequest();
}
-
+
+ // Set argument list for request.
QList<QVariant> arguments;
arguments.append(argument);
mRadioControlRequest->setArguments(arguments);
prepareRequestInfo(mRadioControlRequest, visibility);
-
+
+ LOG("Send request");
bool res = mRadioControlRequest->send();
if (!res) {
+ LOG("Send failed");
int error = mRadioControlRequest->lastError();
handleRequestError(error);
}
-
- //stopMonitoring();
- //startMonitoring();
}
/*!
Start FM Radio information listening.
*/
-void FmRadioHsWidgetRadioServiceClient::doSendMonitorRequest(FmRadioVisibilty visibility)
+void FmRadioHsWidgetRadioServiceClient::doSendMonitorRequest(
+ const FmRadioVisibilty visibility)
{
+ LOG_METHOD;
prepareRequestInfo(mRadioMonitorRequest, visibility);
if (!mRequestPending) {
- //FmRadioHsWidgetRadioServiceSingleton::instance()->sendRequest();
+ LOG("Send request");
mRequestPending = mRadioMonitorRequest->send();
}
}
@@ -196,19 +178,34 @@
/param value
*/
-void FmRadioHsWidgetRadioServiceClient::handleFmRadioInformationChange(const QVariant& value)
+void FmRadioHsWidgetRadioServiceClient::handleFmRadioInformationChange(
+ const QVariant &value)
{
+ LOG_METHOD;
+ LEVEL2(LOG_SLOT_CALLER);
+ // Request is not pending anymore.
mRequestPending = false;
+ // If first request was refresh operation.
if (!mDataInitialized) {
+ LOG("Set operation to KRadioServiceMonitorOperation");
+ // Change the operation to the monitoring.
mRadioMonitorRequest->setOperation(KRadioServiceMonitorOperation);
+ // Data is now initialized.
mDataInitialized = true;
}
+ // Request notifications again.
startMonitoring(DoNotChange);
+
+ // If valid and right kind of data was received.
if ( value.isValid() && value.canConvert( QVariant::List ) ) {
QVariantList notificationList = value.toList();
+ // Iterate through the list.
foreach ( const QVariant& variant, notificationList ) {
+ // Extract notification data.
RadioNotificationData notification = variant.value<RadioNotificationData>();
+ // And it's type.
const int notificationId = notification.mType;
+ // Emit the new information.
emit radioInformationChanged( notificationId, notification.mData );
}
}
@@ -219,8 +216,9 @@
/param int Error value.
*/
-void FmRadioHsWidgetRadioServiceClient::handleRequestError(int error)
+void FmRadioHsWidgetRadioServiceClient::handleRequestError(const int error)
{
+ LOG_METHOD;
QString errorStr;
QVariant var(FmRadioHsWidget::NotRunning);
switch (error) {
@@ -228,28 +226,30 @@
errorStr = "No error";
break;
case XQService::EConnectionError:
- errorStr = "(/*!< Error in IPC Connection */";
+ errorStr = "Error in IPC Connection";
break;
case XQService::EConnectionClosed:
- errorStr = "/*!< IPC Connection is closed */";
+ errorStr = "IPC Connection is closed";
stopMonitoring();
handleFmRadioStateChange(var);
break;
case XQService::EServerNotFound:
- errorStr = "/*!< Can not find server */";
+ errorStr = "Can not find server";
break;
case XQService::EIPCError:
- errorStr = "/*!< Known IPC error defined by SDK */";
+ errorStr = "Known IPC error defined by SDK";
break;
case XQService::EUnknownError:
- errorStr = "/*!< Unknown IPC error */";
+ errorStr = "Unknown IPC error";
break;
case XQService::ERequestPending:
- errorStr = "/*!< Already pending request */";
+ errorStr = "Already pending request";
break;
default:
+ errorStr = "default case";
break;
}
+ LOG(GETSTRING(errorStr));
}
/*!
@@ -257,35 +257,28 @@
/param value New state of FM Radio.
*/
-void FmRadioHsWidgetRadioServiceClient::handleFmRadioStateChange(QVariant& value)
+void FmRadioHsWidgetRadioServiceClient::handleFmRadioStateChange(
+ const QVariant &value)
{
+ LOG_METHOD;
if (value.isValid()) {
emit radioStateChanged(value);
}
}
/*!
- Handle request completion.
-
- /param value
- */
-void FmRadioHsWidgetRadioServiceClient::requestCompleted(const QVariant& value)
-{
- if (value.isValid()) {
- }
-}
-
-/*!
Handle error.
/param errorCode
/param errorMessage
*/
-void FmRadioHsWidgetRadioServiceClient::handleError(int errorCode, const QString& errorMessage)
+void FmRadioHsWidgetRadioServiceClient::handleError(const int errorCode,
+ const QString &errorMessage)
{
- int e = errorCode;
- QString em = errorMessage;
- handleRequestError(e);
+ Q_UNUSED(errorMessage)
+ LOG_METHOD;
+ LEVEL2(LOG_SLOT_CALLER);
+ handleRequestError(errorCode);
}
/*!
@@ -293,37 +286,10 @@
*/
void FmRadioHsWidgetRadioServiceClient::createControlServiceRequest()
{
+ LOG_METHOD;
if (!mRadioControlRequest) {
- QString fullInterfaceName = /*KRadioServiceName +"."+*/ KRadioServiceControlInterfaceName;
- mRadioControlRequest = mApplicationManager.create(fullInterfaceName,
- KRadioServiceControlOperation, false);
-
- if (mRadioControlRequest) {
- mRadioControlRequest->setEmbedded(false);
- mRadioControlRequest->setSynchronous(true);
- //TODO: Do backgound set through XQRequestInfo in MCL wk14.
- //mRadioControlRequest->setBackground(true);
-
- /*
- bool b = connect(mRadioControlRequest, SIGNAL(requestOk(const QVariant&)), this,
- SLOT(requestCompleted(const QVariant&)));
- bool t = connect(mRadioControlRequest, SIGNAL(requestError(int,const QString&)), this,
- SLOT(handleError(int,const QString&)));
- */
- }
- }
-}
-
-/*!
- Creates monitor service request object.
- */
-void FmRadioHsWidgetRadioServiceClient::createMonitorServiceRequest()
-{
- if (!mRadioMonitorRequest) {
- QString operation = mDataInitialized ? KRadioServiceMonitorOperation
- : KRadioServiceRefreshOperation;
- QString fullInterfaceName = /*KRadioServiceName +"."+*/ KRadioServiceMonitorInterfaceName;
-
+ // Following commented code is for debugging when changing service and interface names.
+ //QString fullInterfaceName = /*KRadioServiceName +"."+*/ KRadioServiceControlInterfaceName;
/*
QList<XQAiwInterfaceDescriptor> list;
list = mApplicationManager.list(KRadioServiceName, fullInterfaceName, "");
@@ -337,23 +303,75 @@
}
}
*/
-
/*
mRadioMonitorRequest = mApplicationManager.create(interfaceDescriptor,
- KRadioServiceMonitorOperation, false);
+ KRadioServiceControlOperation, false);
*/
+
+ LOG("Create request");
+ mRadioControlRequest = mApplicationManager.create(
+ KRadioServiceControlInterfaceName, KRadioServiceControlOperation,
+ false);
+
+ if (mRadioControlRequest) {
+ LOG("Request created");
+ // Request is synchronous.
+ mRadioControlRequest->setSynchronous(true);
+ // Request is not embedded.
+ mRadioControlRequest->setEmbedded(false);
+ }
+ }
+}
+/*!
+ Creates monitor service request object.
+ */
+void FmRadioHsWidgetRadioServiceClient::createMonitorServiceRequest()
+{
+ LOG_METHOD;
+ if (!mRadioMonitorRequest) {
+ // If data is not initialized, set operation to refresh,
+ // otherwise to monitor operation.
+ QString operation = mDataInitialized ? KRadioServiceMonitorOperation
+ : KRadioServiceRefreshOperation;
+ QString fullInterfaceName = /*KRadioServiceName +"."+*/ KRadioServiceMonitorInterfaceName;
+
+ // Following commented code is for debugging when changing service and interface names.
+ /*
+ QList<XQAiwInterfaceDescriptor> list;
+ list = mApplicationManager.list(KRadioServiceName, fullInterfaceName, "");
+ XQAiwInterfaceDescriptor interfaceDescriptor;
+ foreach (XQAiwInterfaceDescriptor d, list)
+ {
+ QString in = d.interfaceName();
+ QString sn = d.serviceName();
+ if (sn == KRadioServiceName && in == fullInterfaceName) {
+ interfaceDescriptor = d;
+ }
+ }
+ */
+ /*
+ mRadioMonitorRequest = mApplicationManager.create(interfaceDescriptor,
+ operation, false);
+ */
+
+ LOG("Create request");
mRadioMonitorRequest = mApplicationManager.create(
- fullInterfaceName, operation, false);
-
+ KRadioServiceMonitorInterfaceName, operation, false);
+
if (mRadioMonitorRequest) {
+ LOG("Request created");
+ // Connect request to handle it's completion.
connect(mRadioMonitorRequest, SIGNAL(requestOk(const QVariant&)),
this, SLOT(handleFmRadioInformationChange(const QVariant&)));
+ // Connect request to handle it's error.
connect(mRadioMonitorRequest,
SIGNAL(requestError(int,const QString&)), this,
SLOT(handleError(int,const QString&)));
-
+
+ // Request is asynchronous.
mRadioMonitorRequest->setSynchronous(false);
+ // Request is not embedded.
mRadioMonitorRequest->setEmbedded(false);
}
}
@@ -364,8 +382,8 @@
*/
void FmRadioHsWidgetRadioServiceClient::startMonitoring(FmRadioVisibilty visibility)
{
- //FmRadioHsWidgetRadioServiceSingleton::instance(this)->requestNotifications(this);
-
+ LOG_METHOD;
+ // If there is no mRadioMonitorRequest create it.
if (!mRadioMonitorRequest) {
createMonitorServiceRequest();
}
@@ -377,26 +395,27 @@
*/
void FmRadioHsWidgetRadioServiceClient::stopMonitoring()
{
- //FmRadioHsWidgetRadioServiceSingleton::instance(this)->cancelNotifications(this);
-
+ LOG_METHOD;
+ // Delete the mRadioMonitorRequest.
if (mRadioMonitorRequest) {
delete mRadioMonitorRequest;
mRadioMonitorRequest = NULL;
+ mRequestPending = false;
+ mDataInitialized = false;
}
- mRequestPending = false;
- mDataInitialized = false;
}
/*!
Prepares the visibility of the request.
*/
-void FmRadioHsWidgetRadioServiceClient::prepareRequestInfo(XQAiwRequest *request,
- FmRadioVisibilty visibility)
+void FmRadioHsWidgetRadioServiceClient::prepareRequestInfo(
+ XQAiwRequest *request, const FmRadioVisibilty visibility)
{
+ LOG_METHOD;
XQRequestInfo info;
switch (visibility) {
case ToForeground:
- //info.setForeground(true);
+ info.setForeground(true);
break;
case ToBackground:
info.setBackground(true);
@@ -407,91 +426,5 @@
}
if (request) {
request->setInfo(info);
- bool a = request->isBackground();
}
- //bool f = info.isForeground();
- bool b = info.isBackground();
}
-
-void FmRadioHsWidgetRadioServiceClient::test()
-{
- // Test is kept for example. We have to switch to use the XQAiwRequest and this includes workin example code.
- //XQAiwRequest* req;
-/*
- QUrl uri("application://101FF976");
- QString a = "Uri=" + uri.toString();
- if (uri.isValid()) {
- QString b = "isValid";
- }
- QString c = "Uri authority=" + uri.authority();
-*/
-/*
- QList<XQAiwInterfaceDescriptor> list = mApplicationManager.list(KRadioServiceName, KRadioServiceMonitorInterfaceName);
- foreach (XQAiwInterfaceDescriptor d, list) {
- QString in = d.interfaceName();
- QString sn = d.serviceName();
- }
-
- list = mApplicationManager.list(KRadioServiceName, KRadioServiceMonitorInterfaceName, "");
- foreach (XQAiwInterfaceDescriptor d, list) {
- QString in = d.interfaceName();
- QString sn = d.serviceName();
- }
-
- list = mApplicationManager.list(KRadioServiceMonitorInterfaceName, "");
- foreach (XQAiwInterfaceDescriptor d, list) {
- QString in = d.interfaceName();
- QString sn = d.serviceName();
- }
-*/
- //req = mApplicationManager.create(uri, false);
-
- /*req = mApplicationManager.create(KRadioServiceMonitorInterfaceName, KRadioServiceMonitorOperation,
- false);*/
-
-/* ///
- if (!mRadioMonitorRequest) {
- createMonitorServiceRequest();
- }
- bool res = mRadioMonitorRequest->send();
-///
-*/
-
- /*if (req) {*/
-/*
- // Connect signals once
- bool a = connect(req, SIGNAL(requestOk(const QVariant&)), this,
- SLOT(handleOk(const QVariant&)));
- bool b = connect(req, SIGNAL(requestError(int,const QString&)), this,
- SLOT(handleError(int,const QString&)));
-*/
- /*bool b = connect(req, SIGNAL(requestOk(const QVariant&)), this,
- SLOT(handleFmRadioInformationChange(QVariant)));
- bool c = connect(req, SIGNAL(requestError(int,const QString&)), this,
- SLOT(handleError(int,const QString&)));*/
-/*
- QList<QVariant> arg;
- arg << "";
- req->setArguments(arg);
-*/
-/*
- QString op = req->operation();
- req->setOperation(KRadioServiceMonitorOperation);
- op = req->operation();
-*/
- /*bool res = req->send();*/
-
- /*if (res) {
- //QTimer::singleShot(40000, this, SLOT(doSendMonitorRequest()));
- }
- else {
- // Request failed.
- int x = 2;
- }
-
- }
- else {
- int r;
- r = 5;
- }*/
-}
--- a/hswidgetplugin/fmradiohswidgetplugin_exports_to_rom.pri Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugin_exports_to_rom.pri Fri Jun 11 13:38:32 2010 +0300
@@ -27,7 +27,7 @@
#iby exports to language
#BLD_INF_RULES.prj_exports += \
-#"rom/homescreenapp_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(homescreenapp_resources.iby)"
+#"rom/fmradiohswidgetplugin_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(fmradiohswidgetplugin_resources.iby)"
BLD_INF_RULES.prj_extensions += \
$$LITERAL_HASH"ifdef MARM" \
--- a/hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -15,23 +15,31 @@
*
*/
+// System includes
#include <qservicemanager.h>
#include <QCoreApplication>
#include <QFile>
+// User includes
+#include "radiologger.h"
+
QTM_USE_NAMESPACE
const QString KXml = "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml";
int main(int argc, char *argv[])
{
+ LOG_METHOD;
+
QCoreApplication app(argc, argv);
QServiceManager s;
if (QFile::exists(KXml)) {
+ LOG_FORMAT( "Add %s service", GETSTRING(KXml) );
s.addService(KXml);
} else {
+ LOG("Remove fmradiohswidgetplugin service.");
s.removeService("fmradiohswidgetplugin");
}
}
--- a/hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.pro Fri Jun 11 13:38:32 2010 +0300
@@ -25,6 +25,9 @@
MOBILITY = serviceframework
SOURCES += fmradiohswidgetplugininstaller.cpp
+SOURCES += ../../common/radiologger.cpp
+
+INCLUDEPATH += ../../common
symbian {
TARGET.CAPABILITY = ALL -TCB
--- a/hswidgetplugin/sis/fmradiohswidgetplugin.pkg Fri Jun 04 10:21:36 2010 +0100
+++ b/hswidgetplugin/sis/fmradiohswidgetplugin.pkg Fri Jun 11 13:38:32 2010 +0300
@@ -33,13 +33,16 @@
[0x102752AE],0,0,0,{"S60ProductID"}
[0x1028315F],0,0,0,{"S60ProductID"}
-"/epoc32/release/armv5/urel/fmradiohswidgetplugin.dll" - "c:/sys/bin/fmradiohswidgetplugin.dll"
-"../fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin" - "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.qtplugin"
-"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.manifest" - "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.manifest"
-"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.s60xml" - "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
-"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css" - "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.css"
-;"/epoc32/data/z/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.s60xml" - "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
-;"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.xml" - "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
-;"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin_icon.png" - "!:\private\20022F35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin_icon.png"
+"/epoc32/release/armv5/urel/fmradiohswidgetplugin.dll" - "!:/sys/bin/fmradiohswidgetplugin.dll"
+"../fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.qtplugin"
+"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.manifest"
+"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.s60xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
+"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.css"
+;"/epoc32/data/z/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.s60xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
+;"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
+;"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin_icon.png" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin_icon.png"
-"/epoc32/release/armv5/urel/fmradiohswidgetplugininstaller.exe" - "c:/sys/bin/fmradiohswidgetplugininstaller.exe", FR, RB, RW
+"/epoc32/data/z/resource/qt/translations/fmradiohswidgetplugin.qm" - "!:/resource/qt/translations/fmradiohswidgetplugin.qm"
+"/epoc32/data/z/resource/qt/translations/fmradiohswidgetplugin_en_us.qm" - "!:/resource/qt/translations/fmradiohswidgetplugin_en_us.qm"
+
+"/epoc32/release/armv5/urel/fmradiohswidgetplugininstaller.exe" - "!:/sys/bin/fmradiohswidgetplugininstaller.exe", FR, RB, RW
Binary file radioapp/bin/fmradio_en_US.qm has changed
--- a/radioapp/buildflags.pri Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/buildflags.pri Fri Jun 11 13:38:32 2010 +0300
@@ -32,9 +32,6 @@
# Functional testing
# RADIOFLAGS += SHOW_CALLSIGN_IN_ANY_REGION
-# Build flag to enable usage of the new preset utility
-RADIOFLAGS += COMPILE_WITH_NEW_PRESET_UTILITY
-
# Build flag to add EXPORTUNFROZEN to the pro file
# RADIOFLAGS += USE_UNFROZEN_EXPORTS
@@ -47,10 +44,10 @@
# Full logging flag that enables the full logging including also timestamps
# Enabled by default in debug builds
- CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
+# CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
# Uncomment to enable full logging in release builds
-# LOGGING_FLAGS *= LOGGING_ENABLED
+LOGGING_FLAGS *= LOGGING_ENABLED
# Timestamp logging flag that enables only timestamp logging
# LOGGING_FLAGS += TIMESTAMP_LOGGING_ENABLED
@@ -58,6 +55,17 @@
# Combines Ui and Engine logs by feeding UI traces to the engine logger
LOGGING_FLAGS += COMBINE_WITH_ENGINE_LOGGER
+# Logging level
+# 1 - Normal level
+# 2 - More verbose level
+# 3 - Most verbose level
+LOGGING_FLAGS += LOGGING_LEVEL=1
+
+# Select which radio component is being logged
+# 1 - Radio application
+# 2 - Radio homescreen widget
+LOGGING_FLAGS += LOGGED_COMPONENT=1
+
contains(LOGGING_FLAGS, TIMESTAMP_LOGGING_ENABLED)|contains(LOGGING_FLAGS, LOGGING_ENABLED) {
# Writes debug prints to file if enabled
@@ -75,6 +83,11 @@
# 2 - Log failed connection and halt debugger
LOGGING_FLAGS += CONNECT_TEST_MODE=2
+win32: {
+ LOGGING_FLAGS *= LOGGING_ENABLED # Logging is always enabled in Win32 environment
+ RADIOFLAGS += VID_DEFAULT=0
+}
+
DEFINES += $$LOGGING_FLAGS
# ##########################################################
@@ -87,7 +100,7 @@
CONFIG += $$LOGGING_FLAGS
symbian: {
- DEFINES += SYMBIAN
+ DEFINES += SYMBIAN
TARGET.EPOCALLOWDLLDATA = 1
TARGET.VID = VID_DEFAULT
TARGET.CAPABILITY = CAP_GENERAL_DLL
@@ -98,10 +111,15 @@
DESTDIR = ../bin
LIBS += -L../bin
INCLUDEPATH += ../radioenginewrapper/inc
+ INCLUDEPATH += ../../internal/win32_stubs
+ HEADERS += ../../internal/win32_stubs/qsysteminfo.h
+ HEADERS += ../../internal/win32_stubs/xqserviceutil.h
+ HEADERS += ../../internal/win32_stubs/xqserviceprovider.h
+ SOURCES += ../../internal/win32_stubs/win32_stubs.cpp
}
USE_UNFROZEN_EXPORTS {
- symbian:MMP_RULES += "exportunfrozen"
+ symbian:MMP_RULES += "exportunfrozen"
symbian:DEF_FILE = not_used.def
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/bwins/fmradioenginewrapperu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,47 @@
+EXPORTS
+ ?skipPrevious@RadioEngineWrapperObserver@@UAEXXZ @ 1 NONAME ; void RadioEngineWrapperObserver::skipPrevious(void)
+ ?volumeChanged@RadioEngineWrapperObserver@@UAEXH@Z @ 2 NONAME ; void RadioEngineWrapperObserver::volumeChanged(int)
+ ?init@RadioEngineWrapper@@QAE_NXZ @ 3 NONAME ; bool RadioEngineWrapper::init(void)
+ ?settings@RadioEngineWrapper@@QAEAAVRadioSettingsIf@@XZ @ 4 NONAME ; class RadioSettingsIf & RadioEngineWrapper::settings(void)
+ ?region@RadioEngineWrapper@@QBE?AW4Region@RadioRegion@@XZ @ 5 NONAME ; enum RadioRegion::Region RadioEngineWrapper::region(void) const
+ ?initCombinedLogger@RadioLogger@@SAXXZ @ 6 NONAME ; void RadioLogger::initCombinedLogger(void)
+ ?removeObserver@RadioEngineWrapper@@QAEXPAVRadioEngineWrapperObserver@@@Z @ 7 NONAME ; void RadioEngineWrapper::removeObserver(class RadioEngineWrapperObserver *)
+ ?decreaseVolume@RadioEngineWrapper@@QAEXXZ @ 8 NONAME ; void RadioEngineWrapper::decreaseVolume(void)
+ ?isRadioOn@RadioEngineWrapper@@QBE_NXZ @ 9 NONAME ; bool RadioEngineWrapper::isRadioOn(void) const
+ ?addObserver@RadioEngineWrapper@@QAEXPAVRadioEngineWrapperObserver@@@Z @ 10 NONAME ; void RadioEngineWrapper::addObserver(class RadioEngineWrapperObserver *)
+ ?isAntennaAttached@RadioEngineWrapper@@QBE_NXZ @ 11 NONAME ; bool RadioEngineWrapper::isAntennaAttached(void) const
+ ?toggleAudioRoute@RadioEngineWrapper@@QAEXXZ @ 12 NONAME ; void RadioEngineWrapper::toggleAudioRoute(void)
+ ?setVolume@RadioEngineWrapper@@QAEXH@Z @ 13 NONAME ; void RadioEngineWrapper::setVolume(int)
+ ?setMute@RadioEngineWrapper@@QAEX_N0@Z @ 14 NONAME ; void RadioEngineWrapper::setMute(bool, bool)
+ ??0RadioEngineWrapper@@QAE@AAVRadioStationHandlerIf@@@Z @ 15 NONAME ; RadioEngineWrapper::RadioEngineWrapper(class RadioStationHandlerIf &)
+ ?cancelSeeking@RadioEngineWrapper@@QAEXXZ @ 16 NONAME ; void RadioEngineWrapper::cancelSeeking(void)
+ ?d_func@RadioEngineWrapper@@AAEPAVRadioEngineWrapperPrivate@@XZ @ 17 NONAME ; class RadioEngineWrapperPrivate * RadioEngineWrapper::d_func(void)
+ ?d_func@RadioEngineWrapper@@ABEPBVRadioEngineWrapperPrivate@@XZ @ 18 NONAME ; class RadioEngineWrapperPrivate const * RadioEngineWrapper::d_func(void) const
+ ?releaseCombinedLogger@RadioLogger@@SAXXZ @ 19 NONAME ; void RadioLogger::releaseCombinedLogger(void)
+ ??1RadioEngineWrapper@@QAE@XZ @ 20 NONAME ; RadioEngineWrapper::~RadioEngineWrapper(void)
+ ?radioStatusChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 21 NONAME ; void RadioEngineWrapperObserver::radioStatusChanged(bool)
+ ?increaseVolume@RadioEngineWrapperObserver@@UAEXXZ @ 22 NONAME ; void RadioEngineWrapperObserver::increaseVolume(void)
+ ?frequencyStepSize@RadioEngineWrapper@@QBEIXZ @ 23 NONAME ; unsigned int RadioEngineWrapper::frequencyStepSize(void) const
+ ??0MethodLogger@@QAE@PBD0@Z @ 24 NONAME ; MethodLogger::MethodLogger(char const *, char const *)
+ ?isFrequencyValid@RadioEngineWrapper@@QBE_NI@Z @ 25 NONAME ; bool RadioEngineWrapper::isFrequencyValid(unsigned int) const
+ ?setFrequency@RadioEngineWrapper@@QAEXIH@Z @ 26 NONAME ; void RadioEngineWrapper::setFrequency(unsigned int, int)
+ ?setRdsEnabled@RadioEngineWrapper@@QAEX_N@Z @ 27 NONAME ; void RadioEngineWrapper::setRdsEnabled(bool)
+ ?logMsg@RadioLogger@@SAXPBDW4Mode@1@@Z @ 28 NONAME ; void RadioLogger::logMsg(char const *, enum RadioLogger::Mode)
+ ?audioRouteChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 29 NONAME ; void RadioEngineWrapperObserver::audioRouteChanged(bool)
+ ?isMuted@RadioEngineWrapper@@QBE_NXZ @ 30 NONAME ; bool RadioEngineWrapper::isMuted(void) const
+ ?isUsingLoudspeaker@RadioEngineWrapper@@QBE_NXZ @ 31 NONAME ; bool RadioEngineWrapper::isUsingLoudspeaker(void) const
+ ?currentFrequency@RadioEngineWrapper@@QBEIXZ @ 32 NONAME ; unsigned int RadioEngineWrapper::currentFrequency(void) const
+ ?skipNext@RadioEngineWrapperObserver@@UAEXXZ @ 33 NONAME ; void RadioEngineWrapperObserver::skipNext(void)
+ ?isInManualSeekMode@RadioEngineWrapper@@QBE_NXZ @ 34 NONAME ; bool RadioEngineWrapper::isInManualSeekMode(void) const
+ ?muteChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 35 NONAME ; void RadioEngineWrapperObserver::muteChanged(bool)
+ ?startSeeking@RadioEngineWrapper@@QAEXW4Direction@Seek@@H@Z @ 36 NONAME ; void RadioEngineWrapper::startSeeking(enum Seek::Direction, int)
+ ?decreaseVolume@RadioEngineWrapperObserver@@UAEXXZ @ 37 NONAME ; void RadioEngineWrapperObserver::decreaseVolume(void)
+ ?minFrequency@RadioEngineWrapper@@QBEIXZ @ 38 NONAME ; unsigned int RadioEngineWrapper::minFrequency(void) const
+ ?rdsAvailabilityChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 39 NONAME ; void RadioEngineWrapperObserver::rdsAvailabilityChanged(bool)
+ ?tunedToFrequency@RadioEngineWrapperObserver@@UAEXIH@Z @ 40 NONAME ; void RadioEngineWrapperObserver::tunedToFrequency(unsigned int, int)
+ ??1MethodLogger@@QAE@XZ @ 41 NONAME ; MethodLogger::~MethodLogger(void)
+ ?antennaStatusChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 42 NONAME ; void RadioEngineWrapperObserver::antennaStatusChanged(bool)
+ ?setManualSeekMode@RadioEngineWrapper@@QAEX_N@Z @ 43 NONAME ; void RadioEngineWrapper::setManualSeekMode(bool)
+ ?increaseVolume@RadioEngineWrapper@@QAEXXZ @ 44 NONAME ; void RadioEngineWrapper::increaseVolume(void)
+ ?maxFrequency@RadioEngineWrapper@@QBEIXZ @ 45 NONAME ; unsigned int RadioEngineWrapper::maxFrequency(void) const
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/bwins/fmradiopresetstorageu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,14 @@
+EXPORTS
+ ??1RadioPresetStorage@@QAE@XZ @ 1 NONAME ; RadioPresetStorage::~RadioPresetStorage(void)
+ ?savePreset@RadioPresetStorage@@QAE_NABVRadioStationIf@@@Z @ 2 NONAME ; bool RadioPresetStorage::savePreset(class RadioStationIf const &)
+ ?maxNumberOfPresets@RadioPresetStorage@@QBEHXZ @ 3 NONAME ; int RadioPresetStorage::maxNumberOfPresets(void) const
+ ??0RadioPresetStorage@@QAE@XZ @ 4 NONAME ; RadioPresetStorage::RadioPresetStorage(void)
+ ?nextPreset@RadioPresetStorage@@QBEHH@Z @ 5 NONAME ; int RadioPresetStorage::nextPreset(int) const
+ ?deletePreset@RadioPresetStorage@@QAE_NH@Z @ 6 NONAME ; bool RadioPresetStorage::deletePreset(int)
+ ?firstPreset@RadioPresetStorage@@QBEHXZ @ 7 NONAME ; int RadioPresetStorage::firstPreset(void) const
+ ?readPreset@RadioPresetStorage@@QAE_NHAAVRadioStationIf@@@Z @ 8 NONAME ; bool RadioPresetStorage::readPreset(int, class RadioStationIf &)
+ ?presetCount@RadioPresetStorage@@QBEHXZ @ 9 NONAME ; int RadioPresetStorage::presetCount(void) const
+ ?d_func@RadioPresetStorage@@AAEPAVRadioPresetStoragePrivate@@XZ @ 10 NONAME ; class RadioPresetStoragePrivate * RadioPresetStorage::d_func(void)
+ ?d_func@RadioPresetStorage@@ABEPBVRadioPresetStoragePrivate@@XZ @ 11 NONAME ; class RadioPresetStoragePrivate const * RadioPresetStorage::d_func(void) const
+ ?readFrequencies@RadioPresetStorage@@QAEXAAV?$QList@I@@@Z @ 12 NONAME ; void RadioPresetStorage::readFrequencies(class QList<unsigned int> &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/bwins/fmradiouiengineu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,252 @@
+EXPORTS
+ ?tr@RadioUiEngine@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString RadioUiEngine::tr(char const *, char const *)
+ ?setFrequency@RadioHistoryItem@@QAEXI@Z @ 2 NONAME ; void RadioHistoryItem::setFrequency(unsigned int)
+ ?currentStation@RadioStationModel@@QBEABVRadioStation@@XZ @ 3 NONAME ; class RadioStation const & RadioStationModel::currentStation(void) const
+ ?rowCount@RadioHistoryModel@@UBEHABVQModelIndex@@@Z @ 4 NONAME ; int RadioHistoryModel::rowCount(class QModelIndex const &) const
+ ?contains@RadioStationModel@@QBE_NI@Z @ 5 NONAME ; bool RadioStationModel::contains(unsigned int) const
+ ?qt_metacast@RadioUiEngine@@UAEPAXPBD@Z @ 6 NONAME ; void * RadioUiEngine::qt_metacast(char const *)
+ ?parseFrequency@RadioStation@@SA?AVQString@@I@Z @ 7 NONAME ; class QString RadioStation::parseFrequency(unsigned int)
+ ??0RadioStation@@QAE@ABV0@@Z @ 8 NONAME ; RadioStation::RadioStation(class RadioStation const &)
+ ?skipStation@RadioUiEngine@@QAEIW4Mode@StationSkip@@I@Z @ 9 NONAME ; unsigned int RadioUiEngine::skipStation(enum StationSkip::Mode, unsigned int)
+ ?region@RadioUiEngine@@QBE?AW4Region@RadioRegion@@XZ @ 10 NONAME ; enum RadioRegion::Region RadioUiEngine::region(void) const
+ ?frequency@RadioStation@@QBEIXZ @ 11 NONAME ; unsigned int RadioStation::frequency(void) const
+ ?setFavoriteByFrequency@RadioStationModel@@QAEXI_N@Z @ 12 NONAME ; void RadioStationModel::setFavoriteByFrequency(unsigned int, bool)
+ ??_ERadioHistoryItem@@UAE@I@Z @ 13 NONAME ; RadioHistoryItem::~RadioHistoryItem(unsigned int)
+ ?isInitialized@RadioUiEngine@@QBE_NXZ @ 14 NONAME ; bool RadioUiEngine::isInitialized(void) const
+ ?staticMetaObject@RadioUiEngine@@2UQMetaObject@@B @ 15 NONAME ; struct QMetaObject const RadioUiEngine::staticMetaObject
+ ?indexFromFrequency@RadioStationModel@@QAEHI@Z @ 16 NONAME ; int RadioStationModel::indexFromFrequency(unsigned int)
+ ?stationsInRange@RadioStationModel@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 17 NONAME ; class QList<class RadioStation> RadioStationModel::stationsInRange(unsigned int, unsigned int)
+ ?setName@RadioStation@@QAEXABVQString@@@Z @ 18 NONAME ; void RadioStation::setName(class QString const &)
+ ?settings@RadioUiEngine@@QAEAAVRadioSettingsIf@@XZ @ 19 NONAME ; class RadioSettingsIf & RadioUiEngine::settings(void)
+ ?emitAntennaStatusChanged@RadioUiEngine@@AAEX_N@Z @ 20 NONAME ; void RadioUiEngine::emitAntennaStatusChanged(bool)
+ ?hasPiCode@RadioStation@@QBE_NXZ @ 21 NONAME ; bool RadioStation::hasPiCode(void) const
+ ??_ERadioScannerEngine@@UAE@I@Z @ 22 NONAME ; RadioScannerEngine::~RadioScannerEngine(unsigned int)
+ ?setFavoriteByPreset@RadioStationModel@@QAEXH_N@Z @ 23 NONAME ; void RadioStationModel::setFavoriteByPreset(int, bool)
+ ?rdsAvailabilityChanged@RadioUiEngine@@IAEX_N@Z @ 24 NONAME ; void RadioUiEngine::rdsAvailabilityChanged(bool)
+ ?decrementReferenceCount@RadioHistoryItem@@AAEXXZ @ 25 NONAME ; void RadioHistoryItem::decrementReferenceCount(void)
+ ?findPresetIndex@RadioStationModel@@QAEHHAAVRadioStation@@@Z @ 26 NONAME ; int RadioStationModel::findPresetIndex(int, class RadioStation &)
+ ?stationHandlerIf@RadioStationModel@@QAEAAVRadioStationHandlerIf@@XZ @ 27 NONAME ; class RadioStationHandlerIf & RadioStationModel::stationHandlerIf(void)
+ ?qt_metacall@RadioHistoryModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 28 NONAME ; int RadioHistoryModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?emitVolumeChanged@RadioUiEngine@@AAEXH@Z @ 29 NONAME ; void RadioUiEngine::emitVolumeChanged(int)
+ ?qt_metacall@RadioUiEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int RadioUiEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?emitAudioRouteChanged@RadioUiEngine@@AAEX_N@Z @ 31 NONAME ; void RadioUiEngine::emitAudioRouteChanged(bool)
+ ?addItem@RadioHistoryModel@@AAEXABVQString@@0ABVRadioStation@@@Z @ 32 NONAME ; void RadioHistoryModel::addItem(class QString const &, class QString const &, class RadioStation const &)
+ ?d_func@RadioScannerEngine@@ABEPBVRadioScannerEnginePrivate@@XZ @ 33 NONAME ; class RadioScannerEnginePrivate const * RadioScannerEngine::d_func(void) const
+ ?setGenre@RadioStation@@QAEXH@Z @ 34 NONAME ; void RadioStation::setGenre(int)
+ ??4RadioStation@@QAEAAV0@ABV0@@Z @ 35 NONAME ; class RadioStation & RadioStation::operator=(class RadioStation const &)
+ ?toggleAudioRoute@RadioUiEngine@@QAEXXZ @ 36 NONAME ; void RadioUiEngine::toggleAudioRoute(void)
+ ?stationModel@RadioUiEngine@@QAEAAVRadioStationModel@@XZ @ 37 NONAME ; class RadioStationModel & RadioUiEngine::stationModel(void)
+ ?unsetType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 38 NONAME ; void RadioStation::unsetType(class QFlags<enum RadioStation::TypeFlag>)
+ ?toggleTagging@RadioHistoryModel@@QAEXABVRadioHistoryItem@@H@Z @ 39 NONAME ; void RadioHistoryModel::toggleTagging(class RadioHistoryItem const &, int)
+ ?muteChanged@RadioUiEngine@@IAEX_N@Z @ 40 NONAME ; void RadioUiEngine::muteChanged(bool)
+ ?maxFrequency@RadioUiEngine@@QBEIXZ @ 41 NONAME ; unsigned int RadioUiEngine::maxFrequency(void) const
+ ?setIcons@RadioStationModel@@QAEXABVQIcon@@0@Z @ 42 NONAME ; void RadioStationModel::setIcons(class QIcon const &, class QIcon const &)
+ ?saveStation@RadioStationModel@@QAEXAAVRadioStation@@@Z @ 43 NONAME ; void RadioStationModel::saveStation(class RadioStation &)
+ ?getStaticMetaObject@RadioHistoryModel@@SAABUQMetaObject@@XZ @ 44 NONAME ; struct QMetaObject const & RadioHistoryModel::getStaticMetaObject(void)
+ ?findUnusedPresetIndex@RadioStationModel@@AAEHXZ @ 45 NONAME ; int RadioStationModel::findUnusedPresetIndex(void)
+ ?hasChanged@RadioStation@@QBE_NXZ @ 46 NONAME ; bool RadioStation::hasChanged(void) const
+ ?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *, int)
+ ?isScanning@RadioUiEngine@@QBE_NXZ @ 48 NONAME ; bool RadioUiEngine::isScanning(void) const
+ ?dynamicPsCheckEnded@RadioStationModel@@AAEXXZ @ 49 NONAME ; void RadioStationModel::dynamicPsCheckEnded(void)
+ ?d_func@RadioHistoryModel@@AAEPAVRadioHistoryModelPrivate@@XZ @ 50 NONAME ; class RadioHistoryModelPrivate * RadioHistoryModel::d_func(void)
+ ?piCodeToCallSign@RadioStation@@AAE?AVQString@@I@Z @ 51 NONAME ; class QString RadioStation::piCodeToCallSign(unsigned int)
+ ?seekStation@RadioUiEngine@@QAEXH@Z @ 52 NONAME ; void RadioUiEngine::seekStation(int)
+ ?setPiCode@RadioStation@@QAE_NHW4Region@RadioRegion@@@Z @ 53 NONAME ; bool RadioStation::setPiCode(int, enum RadioRegion::Region)
+ ?favoriteChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 54 NONAME ; void RadioStationModel::favoriteChanged(class RadioStation const &)
+ ?radioStatusChanged@RadioUiEngine@@IAEX_N@Z @ 55 NONAME ; void RadioUiEngine::radioStatusChanged(bool)
+ ?setIcons@RadioHistoryModel@@QAEXABVQIcon@@0@Z @ 56 NONAME ; void RadioHistoryModel::setIcons(class QIcon const &, class QIcon const &)
+ ?isCurrentSongRecognized@RadioHistoryModel@@QBE_NXZ @ 57 NONAME ; bool RadioHistoryModel::isCurrentSongRecognized(void) const
+ ?clearRadioTextPlus@RadioHistoryModel@@AAEXXZ @ 58 NONAME ; void RadioHistoryModel::clearRadioTextPlus(void)
+ ?addStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 59 NONAME ; void RadioStationModel::addStation(class RadioStation const &)
+ ?lastTunedFrequency@RadioUiEngine@@SAIXZ @ 60 NONAME ; unsigned int RadioUiEngine::lastTunedFrequency(void)
+ ?favoriteCount@RadioStationModel@@QAEHXZ @ 61 NONAME ; int RadioStationModel::favoriteCount(void)
+ ??1RadioScannerEngine@@UAE@XZ @ 62 NONAME ; RadioScannerEngine::~RadioScannerEngine(void)
+ ?tunedToFrequency@RadioUiEngine@@IAEXIH@Z @ 63 NONAME ; void RadioUiEngine::tunedToFrequency(unsigned int, int)
+ ?tr@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 64 NONAME ; class QString RadioUiEngine::tr(char const *, char const *, int)
+ ?isScanning@RadioScannerEngine@@QBE_NXZ @ 65 NONAME ; bool RadioScannerEngine::isScanning(void) const
+ ?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 66 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *)
+ ?emitDataChanged@RadioStationModel@@AAEXABVRadioStation@@@Z @ 67 NONAME ; void RadioStationModel::emitDataChanged(class RadioStation const &)
+ ?setPowerOff@RadioUiEngine@@QAEXH@Z @ 68 NONAME ; void RadioUiEngine::setPowerOff(int)
+ ?isRadioOn@RadioUiEngine@@QBE_NXZ @ 69 NONAME ; bool RadioUiEngine::isRadioOn(void) const
+ ?continueScanning@RadioScannerEngine@@QAEXXZ @ 70 NONAME ; void RadioScannerEngine::continueScanning(void)
+ ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 71 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *, int)
+ ?list@RadioStationModel@@QBEABV?$QMap@IVRadioStation@@@@XZ @ 72 NONAME ; class QMap<unsigned int, class RadioStation> const & RadioStationModel::list(void) const
+ ?tr@RadioStationModel@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString RadioStationModel::tr(char const *, char const *)
+ ?setChangeFlags@RadioStation@@QAEXV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 74 NONAME ; void RadioStation::setChangeFlags(class QFlags<enum RadioStation::ChangeFlag>)
+ ?hasRds@RadioStation@@QBE_NXZ @ 75 NONAME ; bool RadioStation::hasRds(void) const
+ ?findClosest@RadioStationModel@@QAE?AVRadioStation@@IW4Mode@StationSkip@@@Z @ 76 NONAME ; class RadioStation RadioStationModel::findClosest(unsigned int, enum StationSkip::Mode)
+ ?flags@RadioStationModel@@UBE?AV?$QFlags@W4ItemFlag@Qt@@@@ABVQModelIndex@@@Z @ 77 NONAME ; class QFlags<enum Qt::ItemFlag> RadioStationModel::flags(class QModelIndex const &) const
+ ?detach@RadioStation@@QAEXXZ @ 78 NONAME ; void RadioStation::detach(void)
+ ?staticMetaObject@RadioScannerEngine@@2UQMetaObject@@B @ 79 NONAME ; struct QMetaObject const RadioScannerEngine::staticMetaObject
+ ?id@RadioHistoryItem@@QBEHXZ @ 80 NONAME ; int RadioHistoryItem::id(void) const
+ ?stationsInRange@RadioUiEngine@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 81 NONAME ; class QList<class RadioStation> RadioUiEngine::stationsInRange(unsigned int, unsigned int)
+ ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0@Z @ 82 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *)
+ ?tr@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 83 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *, int)
+ ?radioText@RadioStation@@QBE?AVQString@@XZ @ 84 NONAME ; class QString RadioStation::radioText(void) const
+ ?setData@RadioStationModel@@UAE_NABVQModelIndex@@ABVQVariant@@H@Z @ 85 NONAME ; bool RadioStationModel::setData(class QModelIndex const &, class QVariant const &, int)
+ ??0RadioStation@@QAE@HI@Z @ 86 NONAME ; RadioStation::RadioStation(int, unsigned int)
+ ?isInManualSeekMode@RadioUiEngine@@QBE_NXZ @ 87 NONAME ; bool RadioUiEngine::isInManualSeekMode(void) const
+ ?setPsType@RadioStation@@QAEXV?$QFlags@W4PsTypeFlag@RadioStation@@@@@Z @ 88 NONAME ; void RadioStation::setPsType(class QFlags<enum RadioStation::PsTypeFlag>)
+ ?itemAtIndex@RadioHistoryModel@@QBE?AVRadioHistoryItem@@ABVQModelIndex@@@Z @ 89 NONAME ; class RadioHistoryItem RadioHistoryModel::itemAtIndex(class QModelIndex const &) const
+ ?setVolume@RadioUiEngine@@QAEXH@Z @ 90 NONAME ; void RadioUiEngine::setVolume(int)
+ ?setFavorite@RadioStation@@QAEX_N@Z @ 91 NONAME ; void RadioStation::setFavorite(bool)
+ ?emitChangeSignals@RadioStationModel@@AAEXABVRadioStation@@V?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 92 NONAME ; void RadioStationModel::emitChangeSignals(class RadioStation const &, class QFlags<enum RadioStation::ChangeFlag>)
+ ?d_func@RadioStationModel@@ABEPBVRadioStationModelPrivate@@XZ @ 93 NONAME ; class RadioStationModelPrivate const * RadioStationModel::d_func(void) const
+ ?setPresetIndex@RadioStation@@QAEXH@Z @ 94 NONAME ; void RadioStation::setPresetIndex(int)
+ ?tr@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString RadioStationModel::tr(char const *, char const *, int)
+ ??1RadioStationModel@@UAE@XZ @ 96 NONAME ; RadioStationModel::~RadioStationModel(void)
+ ?isMuted@RadioUiEngine@@QBE_NXZ @ 97 NONAME ; bool RadioUiEngine::isMuted(void) const
+ ?renameStation@RadioStationModel@@QAEXHABVQString@@@Z @ 98 NONAME ; void RadioStationModel::renameStation(int, class QString const &)
+ ?emitItemAdded@RadioHistoryModel@@AAEXXZ @ 99 NONAME ; void RadioHistoryModel::emitItemAdded(void)
+ ?currentFrequency@RadioUiEngine@@QBEIXZ @ 100 NONAME ; unsigned int RadioUiEngine::currentFrequency(void) const
+ ?setUserDefinedName@RadioStation@@QAEXABVQString@@@Z @ 101 NONAME ; void RadioStation::setUserDefinedName(class QString const &)
+ ??1RadioStation@@UAE@XZ @ 102 NONAME ; RadioStation::~RadioStation(void)
+ ?getStaticMetaObject@RadioScannerEngine@@SAABUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const & RadioScannerEngine::getStaticMetaObject(void)
+ ?callSignString@RadioStation@@AAE?AVQString@@I@Z @ 104 NONAME ; class QString RadioStation::callSignString(unsigned int)
+ ?isValid@RadioStation@@QBE_NXZ @ 105 NONAME ; bool RadioStation::isValid(void) const
+ ?decrementReferenceCount@RadioStation@@AAEXXZ @ 106 NONAME ; void RadioStation::decrementReferenceCount(void)
+ ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 107 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *, int)
+ ?reset@RadioHistoryItem@@QAEXXZ @ 108 NONAME ; void RadioHistoryItem::reset(void)
+ ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0@Z @ 109 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *)
+ ??0RadioStationModel@@QAE@AAVRadioUiEnginePrivate@@@Z @ 110 NONAME ; RadioStationModel::RadioStationModel(class RadioUiEnginePrivate &)
+ ?stationDataChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 111 NONAME ; void RadioStationModel::stationDataChanged(class RadioStation const &)
+ ?frequency@RadioHistoryItem@@QBEIXZ @ 112 NONAME ; unsigned int RadioHistoryItem::frequency(void) const
+ ?currentStation@RadioStationModel@@QAEAAVRadioStation@@XZ @ 113 NONAME ; class RadioStation & RadioStationModel::currentStation(void)
+ ?isDetached@RadioHistoryItem@@QBE_NXZ @ 114 NONAME ; bool RadioHistoryItem::isDetached(void) const
+ ?genre@RadioStation@@QBEHXZ @ 115 NONAME ; int RadioStation::genre(void) const
+ ?reset@RadioStation@@QAEXXZ @ 116 NONAME ; void RadioStation::reset(void)
+ ?qt_metacall@RadioScannerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 117 NONAME ; int RadioScannerEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?emitTunedToFrequency@RadioUiEngine@@AAEXIH@Z @ 118 NONAME ; void RadioUiEngine::emitTunedToFrequency(unsigned int, int)
+ ??0RadioStation@@QAE@XZ @ 119 NONAME ; RadioStation::RadioStation(void)
+ ?psType@RadioStation@@QBE?AV?$QFlags@W4PsTypeFlag@RadioStation@@@@XZ @ 120 NONAME ; class QFlags<enum RadioStation::PsTypeFlag> RadioStation::psType(void) const
+ ??1RadioHistoryModel@@UAE@XZ @ 121 NONAME ; RadioHistoryModel::~RadioHistoryModel(void)
+ ?d_func@RadioUiEngine@@ABEPBVRadioUiEnginePrivate@@XZ @ 122 NONAME ; class RadioUiEnginePrivate const * RadioUiEngine::d_func(void) const
+ ?scannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 123 NONAME ; class RadioScannerEngine * RadioUiEngine::scannerEngine(void)
+ ?setManualSeekMode@RadioUiEngine@@QAEX_N@Z @ 124 NONAME ; void RadioUiEngine::setManualSeekMode(bool)
+ ?isSongRecognitionAppAvailable@RadioUiEngine@@QAE_NXZ @ 125 NONAME ; bool RadioUiEngine::isSongRecognitionAppAvailable(void)
+ ?startScanning@RadioScannerEngine@@QAEXXZ @ 126 NONAME ; void RadioScannerEngine::startScanning(void)
+ ?emitStationFound@RadioScannerEngine@@AAEXABVRadioStation@@@Z @ 127 NONAME ; void RadioScannerEngine::emitStationFound(class RadioStation const &)
+ ?isValid@RadioHistoryItem@@QBE_NXZ @ 128 NONAME ; bool RadioHistoryItem::isValid(void) const
+ ?findCurrentStation@RadioStationModel@@AAE?AVRadioStation@@I@Z @ 129 NONAME ; class RadioStation RadioStationModel::findCurrentStation(unsigned int)
+ ?setUrl@RadioStation@@QAEXABVQString@@@Z @ 130 NONAME ; void RadioStation::setUrl(class QString const &)
+ ?setFrequency@RadioUiEngine@@QAEXIH@Z @ 131 NONAME ; void RadioUiEngine::setFrequency(unsigned int, int)
+ ?data@RadioHistoryModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 132 NONAME ; class QVariant RadioHistoryModel::data(class QModelIndex const &, int) const
+ ??4RadioHistoryItem@@QAEAAV0@ABV0@@Z @ 133 NONAME ; class RadioHistoryItem & RadioHistoryItem::operator=(class RadioHistoryItem const &)
+ ?url@RadioStation@@QBE?AVQString@@XZ @ 134 NONAME ; class QString RadioStation::url(void) const
+ ?historyModel@RadioUiEngine@@QAEAAVRadioHistoryModel@@XZ @ 135 NONAME ; class RadioHistoryModel & RadioUiEngine::historyModel(void)
+ ?emitRdsAvailabilityChanged@RadioUiEngine@@AAEX_N@Z @ 136 NONAME ; void RadioUiEngine::emitRdsAvailabilityChanged(bool)
+ ?frequencyMhz@RadioStation@@QBE?AVQString@@XZ @ 137 NONAME ; class QString RadioStation::frequencyMhz(void) const
+ ?isAntennaAttached@RadioUiEngine@@QBE_NXZ @ 138 NONAME ; bool RadioUiEngine::isAntennaAttached(void) const
+ ?setStation@RadioHistoryItem@@QAEXABVQString@@@Z @ 139 NONAME ; void RadioHistoryItem::setStation(class QString const &)
+ ?qt_metacast@RadioStationModel@@UAEPAXPBD@Z @ 140 NONAME ; void * RadioStationModel::qt_metacast(char const *)
+ ?presetIndex@RadioStation@@QBEHXZ @ 141 NONAME ; int RadioStation::presetIndex(void) const
+ ?cancel@RadioScannerEngine@@QAEXXZ @ 142 NONAME ; void RadioScannerEngine::cancel(void)
+ ?staticMetaObject@RadioStationModel@@2UQMetaObject@@B @ 143 NONAME ; struct QMetaObject const RadioStationModel::staticMetaObject
+ ?addRecognizedSong@RadioUiEngine@@QAEXABVQString@@0ABVRadioStation@@@Z @ 144 NONAME ; void RadioUiEngine::addRecognizedSong(class QString const &, class QString const &, class RadioStation const &)
+ ?emitMuteChanged@RadioUiEngine@@AAEX_N@Z @ 145 NONAME ; void RadioUiEngine::emitMuteChanged(bool)
+ ?currentSongReset@RadioHistoryModel@@IAEXXZ @ 146 NONAME ; void RadioHistoryModel::currentSongReset(void)
+ ?removeByPresetIndex@RadioStationModel@@QAEXH@Z @ 147 NONAME ; void RadioStationModel::removeByPresetIndex(int)
+ ?d_func@RadioScannerEngine@@AAEPAVRadioScannerEnginePrivate@@XZ @ 148 NONAME ; class RadioScannerEnginePrivate * RadioScannerEngine::d_func(void)
+ ?setFrequency@RadioStation@@QAEXI@Z @ 149 NONAME ; void RadioStation::setFrequency(unsigned int)
+ ?isRenamed@RadioStation@@QBE_NXZ @ 150 NONAME ; bool RadioStation::isRenamed(void) const
+ ?stationAt@RadioStationModel@@QBE?AVRadioStation@@H@Z @ 151 NONAME ; class RadioStation RadioStationModel::stationAt(int) const
+ ?removeStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 152 NONAME ; void RadioStationModel::removeStation(class RadioStation const &)
+ ?openMusicStore@RadioUiEngine@@QAEXABVRadioHistoryItem@@W4MusicStore@1@@Z @ 153 NONAME ; void RadioUiEngine::openMusicStore(class RadioHistoryItem const &, enum RadioUiEngine::MusicStore)
+ ?metaObject@RadioUiEngine@@UBEPBUQMetaObject@@XZ @ 154 NONAME ; struct QMetaObject const * RadioUiEngine::metaObject(void) const
+ ?dynamicPsChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 155 NONAME ; void RadioStationModel::dynamicPsChanged(class RadioStation const &)
+ ?setType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 156 NONAME ; void RadioStation::setType(class QFlags<enum RadioStation::TypeFlag>)
+ ??0RadioHistoryItem@@QAE@XZ @ 157 NONAME ; RadioHistoryItem::RadioHistoryItem(void)
+ ?removeByFrequency@RadioStationModel@@QAEXI@Z @ 158 NONAME ; void RadioStationModel::removeByFrequency(unsigned int)
+ ?isUsingLoudspeaker@RadioUiEngine@@QBE_NXZ @ 159 NONAME ; bool RadioUiEngine::isUsingLoudspeaker(void) const
+ ?findFrequency@RadioStationModel@@QBE_NIAAVRadioStation@@@Z @ 160 NONAME ; bool RadioStationModel::findFrequency(unsigned int, class RadioStation &) const
+ ?findPresetIndex@RadioStationModel@@QAEHH@Z @ 161 NONAME ; int RadioStationModel::findPresetIndex(int)
+ ?setRadioTextPlus@RadioStation@@QAEXHABVQString@@@Z @ 162 NONAME ; void RadioStation::setRadioTextPlus(int, class QString const &)
+ ??0RadioHistoryItem@@QAE@ABV0@@Z @ 163 NONAME ; RadioHistoryItem::RadioHistoryItem(class RadioHistoryItem const &)
+ ?metaObject@RadioStationModel@@UBEPBUQMetaObject@@XZ @ 164 NONAME ; struct QMetaObject const * RadioStationModel::metaObject(void) const
+ ?getStaticMetaObject@RadioStationModel@@SAABUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const & RadioStationModel::getStaticMetaObject(void)
+ ?isPoweringOff@RadioUiEngine@@QBE_NXZ @ 166 NONAME ; bool RadioUiEngine::isPoweringOff(void) const
+ ?tr@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 167 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *)
+ ?removeAll@RadioHistoryModel@@QAEX_N@Z @ 168 NONAME ; void RadioHistoryModel::removeAll(bool)
+ ?audioRouteChanged@RadioUiEngine@@IAEX_N@Z @ 169 NONAME ; void RadioUiEngine::audioRouteChanged(bool)
+ ?setPowerOn@RadioUiEngine@@QAEXXZ @ 170 NONAME ; void RadioUiEngine::setPowerOn(void)
+ ?tr@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 171 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *, int)
+ ?dynamicPsText@RadioStation@@QBE?AVQString@@XZ @ 172 NONAME ; class QString RadioStation::dynamicPsText(void) const
+ ?isFirstTimeStart@RadioUiEngine@@QAE_NXZ @ 173 NONAME ; bool RadioUiEngine::isFirstTimeStart(void)
+ ?setMute@RadioUiEngine@@QAEX_N@Z @ 174 NONAME ; void RadioUiEngine::setMute(bool)
+ ?createScannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 175 NONAME ; class RadioScannerEngine * RadioUiEngine::createScannerEngine(void)
+ ??0RadioScannerEngine@@QAE@AAVRadioUiEnginePrivate@@@Z @ 176 NONAME ; RadioScannerEngine::RadioScannerEngine(class RadioUiEnginePrivate &)
+ ?emitRadioStatusChanged@RadioUiEngine@@AAEX_N@Z @ 177 NONAME ; void RadioUiEngine::emitRadioStatusChanged(bool)
+ ??_ERadioUiEngine@@UAE@I@Z @ 178 NONAME ; RadioUiEngine::~RadioUiEngine(unsigned int)
+ ?init@RadioUiEngine@@QAE_NXZ @ 179 NONAME ; bool RadioUiEngine::init(void)
+ ?setDynamicPsText@RadioStation@@QAEXABVQString@@@Z @ 180 NONAME ; void RadioStation::setDynamicPsText(class QString const &)
+ ?changeFlags@RadioStation@@QBE?AV?$QFlags@W4ChangeFlag@RadioStation@@@@XZ @ 181 NONAME ; class QFlags<enum RadioStation::ChangeFlag> RadioStation::changeFlags(void) const
+ ?d_func@RadioStationModel@@AAEPAVRadioStationModelPrivate@@XZ @ 182 NONAME ; class RadioStationModelPrivate * RadioStationModel::d_func(void)
+ ?addRadioTextPlus@RadioHistoryModel@@AAEXHABVQString@@ABVRadioStation@@@Z @ 183 NONAME ; void RadioHistoryModel::addRadioTextPlus(int, class QString const &, class RadioStation const &)
+ ?qt_metacast@RadioHistoryModel@@UAEPAXPBD@Z @ 184 NONAME ; void * RadioHistoryModel::qt_metacast(char const *)
+ ?nameOrFrequencyMhz@RadioStation@@QBE?AVQString@@XZ @ 185 NONAME ; class QString RadioStation::nameOrFrequencyMhz(void) const
+ ?setDetail@RadioStationModel@@QAEXV?$QFlags@W4DetailFlag@RadioStationModel@@@@@Z @ 186 NONAME ; void RadioStationModel::setDetail(class QFlags<enum RadioStationModel::DetailFlag>)
+ ??1RadioUiEngine@@UAE@XZ @ 187 NONAME ; RadioUiEngine::~RadioUiEngine(void)
+ ?tr@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 188 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *)
+ ?time@RadioHistoryItem@@QBE?AVQString@@XZ @ 189 NONAME ; class QString RadioHistoryItem::time(void) const
+ ?reportChangedData@RadioHistoryModel@@AAEXHH@Z @ 190 NONAME ; void RadioHistoryModel::reportChangedData(int, int)
+ ?artist@RadioHistoryItem@@QBE?AVQString@@XZ @ 191 NONAME ; class QString RadioHistoryItem::artist(void) const
+ ?initialize@RadioStationModel@@QAEXPAVRadioPresetStorage@@PAVRadioEngineWrapper@@@Z @ 192 NONAME ; void RadioStationModel::initialize(class RadioPresetStorage *, class RadioEngineWrapper *)
+ ?isType@RadioStation@@QBE_NV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 193 NONAME ; bool RadioStation::isType(class QFlags<enum RadioStation::TypeFlag>) const
+ ?resetCurrentSong@RadioHistoryModel@@QAEXXZ @ 194 NONAME ; void RadioHistoryModel::resetCurrentSong(void)
+ ?d_func@RadioHistoryModel@@ABEPBVRadioHistoryModelPrivate@@XZ @ 195 NONAME ; class RadioHistoryModelPrivate const * RadioHistoryModel::d_func(void) const
+ ?volumeChanged@RadioUiEngine@@IAEXH@Z @ 196 NONAME ; void RadioUiEngine::volumeChanged(int)
+ ?title@RadioHistoryItem@@QBE?AVQString@@XZ @ 197 NONAME ; class QString RadioHistoryItem::title(void) const
+ ?stationFound@RadioScannerEngine@@IAEXABVRadioStation@@@Z @ 198 NONAME ; void RadioScannerEngine::stationFound(class RadioStation const &)
+ ?resetChangeFlags@RadioStation@@QAEXXZ @ 199 NONAME ; void RadioStation::resetChangeFlags(void)
+ ?data_ptr@RadioStation@@QAEAAPAVRadioStationPrivate@@XZ @ 200 NONAME ; class RadioStationPrivate * & RadioStation::data_ptr(void)
+ ?powerOffRequested@RadioUiEngine@@IAEXXZ @ 201 NONAME ; void RadioUiEngine::powerOffRequested(void)
+ ?metaObject@RadioScannerEngine@@UBEPBUQMetaObject@@XZ @ 202 NONAME ; struct QMetaObject const * RadioScannerEngine::metaObject(void) const
+ ?qt_metacast@RadioScannerEngine@@UAEPAXPBD@Z @ 203 NONAME ; void * RadioScannerEngine::qt_metacast(char const *)
+ ?callSignChar@RadioStation@@AAEDI@Z @ 204 NONAME ; char RadioStation::callSignChar(unsigned int)
+ ??_ERadioStation@@UAE@I@Z @ 205 NONAME ; RadioStation::~RadioStation(unsigned int)
+ ??1RadioHistoryItem@@UAE@XZ @ 206 NONAME ; RadioHistoryItem::~RadioHistoryItem(void)
+ ?detach@RadioHistoryItem@@QAEXXZ @ 207 NONAME ; void RadioHistoryItem::detach(void)
+ ?antennaStatusChanged@RadioUiEngine@@IAEX_N@Z @ 208 NONAME ; void RadioUiEngine::antennaStatusChanged(bool)
+ ?staticMetaObject@RadioHistoryModel@@2UQMetaObject@@B @ 209 NONAME ; struct QMetaObject const RadioHistoryModel::staticMetaObject
+ ?setFirstTimeStartPerformed@RadioUiEngine@@QAEX_N@Z @ 210 NONAME ; void RadioUiEngine::setFirstTimeStartPerformed(bool)
+ ?qt_metacall@RadioStationModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 211 NONAME ; int RadioStationModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?isDetached@RadioStation@@QBE_NXZ @ 212 NONAME ; bool RadioStation::isDetached(void) const
+ ?setRadioText@RadioStation@@QAEXABVQString@@@Z @ 213 NONAME ; void RadioStation::setRadioText(class QString const &)
+ ??0RadioHistoryItem@@QAE@ABVQString@@0@Z @ 214 NONAME ; RadioHistoryItem::RadioHistoryItem(class QString const &, class QString const &)
+ ?name@RadioStation@@QBE?AVQString@@XZ @ 215 NONAME ; class QString RadioStation::name(void) const
+ ?hasDataChanged@RadioStation@@QBE_NV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 216 NONAME ; bool RadioStation::hasDataChanged(class QFlags<enum RadioStation::ChangeFlag>) const
+ ?removeAll@RadioStationModel@@QAEXW4RemoveMode@1@@Z @ 217 NONAME ; void RadioStationModel::removeAll(enum RadioStationModel::RemoveMode)
+ ?data@RadioStationModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 218 NONAME ; class QVariant RadioStationModel::data(class QModelIndex const &, int) const
+ ?itemAdded@RadioHistoryModel@@IAEXXZ @ 219 NONAME ; void RadioHistoryModel::itemAdded(void)
+ ?data_ptr@RadioHistoryItem@@QAEAAPAVRadioHistoryItemPrivate@@XZ @ 220 NONAME ; class RadioHistoryItemPrivate * & RadioHistoryItem::data_ptr(void)
+ ?getStaticMetaObject@RadioUiEngine@@SAABUQMetaObject@@XZ @ 221 NONAME ; struct QMetaObject const & RadioUiEngine::getStaticMetaObject(void)
+ ?setShowDetails@RadioHistoryModel@@QAEX_N@Z @ 222 NONAME ; void RadioHistoryModel::setShowDetails(bool)
+ ?launchSongRecognition@RadioUiEngine@@QAEXXZ @ 223 NONAME ; void RadioUiEngine::launchSongRecognition(void)
+ ?rowCount@RadioStationModel@@UBEHABVQModelIndex@@@Z @ 224 NONAME ; int RadioStationModel::rowCount(class QModelIndex const &) const
+ ?iterateCallSign@RadioStation@@AAE?AVQString@@HH@Z @ 225 NONAME ; class QString RadioStation::iterateCallSign(int, int)
+ ?toggleMute@RadioUiEngine@@QAEXXZ @ 226 NONAME ; void RadioUiEngine::toggleMute(void)
+ ?genreToString@RadioUiEngine@@QAE?AVQString@@HW4Target@GenreTarget@@@Z @ 227 NONAME ; class QString RadioUiEngine::genreToString(int, enum GenreTarget::Target)
+ ??0RadioUiEngine@@QAE@PAVQObject@@@Z @ 228 NONAME ; RadioUiEngine::RadioUiEngine(class QObject *)
+ ?setCurrentTime@RadioHistoryItem@@QAEXXZ @ 229 NONAME ; void RadioHistoryItem::setCurrentTime(void)
+ ?d_func@RadioUiEngine@@AAEPAVRadioUiEnginePrivate@@XZ @ 230 NONAME ; class RadioUiEnginePrivate * RadioUiEngine::d_func(void)
+ ?station@RadioHistoryItem@@QBE?AVQString@@XZ @ 231 NONAME ; class QString RadioHistoryItem::station(void) const
+ ??_ERadioHistoryModel@@UAE@I@Z @ 232 NONAME ; RadioHistoryModel::~RadioHistoryModel(unsigned int)
+ ?minFrequency@RadioUiEngine@@QBEIXZ @ 233 NONAME ; unsigned int RadioUiEngine::minFrequency(void) const
+ ?isTagged@RadioHistoryItem@@QBE_NXZ @ 234 NONAME ; bool RadioHistoryItem::isTagged(void) const
+ ?addScannedFrequency@RadioScannerEngine@@QAEXI@Z @ 235 NONAME ; void RadioScannerEngine::addScannedFrequency(unsigned int)
+ ?setShowTagged@RadioHistoryModel@@QAEX_N@Z @ 236 NONAME ; void RadioHistoryModel::setShowTagged(bool)
+ ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 237 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *)
+ ?frequencyStepSize@RadioUiEngine@@QBEIXZ @ 238 NONAME ; unsigned int RadioUiEngine::frequencyStepSize(void) const
+ ??0RadioHistoryModel@@AAE@AAVRadioUiEngine@@@Z @ 239 NONAME ; RadioHistoryModel::RadioHistoryModel(class RadioUiEngine &)
+ ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 240 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *, int)
+ ?radioTextReceived@RadioStationModel@@IAEXABVRadioStation@@@Z @ 241 NONAME ; void RadioStationModel::radioTextReceived(class RadioStation const &)
+ ?isFavorite@RadioStation@@QBE_NXZ @ 242 NONAME ; bool RadioStation::isFavorite(void) const
+ ?metaObject@RadioHistoryModel@@UBEPBUQMetaObject@@XZ @ 243 NONAME ; struct QMetaObject const * RadioHistoryModel::metaObject(void) const
+ ?seekingStarted@RadioUiEngine@@IAEXH@Z @ 244 NONAME ; void RadioUiEngine::seekingStarted(int)
+ ?emitSeekingStarted@RadioUiEngine@@AAEXW4Direction@Seek@@@Z @ 245 NONAME ; void RadioUiEngine::emitSeekingStarted(enum Seek::Direction)
+ ?isRecognizedByRds@RadioHistoryItem@@QBE_NXZ @ 246 NONAME ; bool RadioHistoryItem::isRecognizedByRds(void) const
+ ?setFavorites@RadioStationModel@@QAEXABV?$QList@VQModelIndex@@@@@Z @ 247 NONAME ; void RadioStationModel::setFavorites(class QList<class QModelIndex> const &)
+ ?setArtist@RadioHistoryItem@@QAEXABVQString@@@Z @ 248 NONAME ; void RadioHistoryItem::setArtist(class QString const &)
+ ??_ERadioStationModel@@UAE@I@Z @ 249 NONAME ; RadioStationModel::~RadioStationModel(unsigned int)
+ ?setTitle@RadioHistoryItem@@QAEXABVQString@@@Z @ 250 NONAME ; void RadioHistoryItem::setTitle(class QString const &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/bwins/fmradiowidgetsu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,156 @@
+EXPORTS
+ ?trUtf8@RadioWindow@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *, int)
+ ?nextIndex@RadioStationCarousel@@AAEHH@Z @ 2 NONAME ; int RadioStationCarousel::nextIndex(int)
+ ?scrollToIndex@RadioStationCarousel@@AAEXHW4Direction@Scroll@@V?$QFlags@W4ScrollFlag@RadioStationCarousel@@@@@Z @ 3 NONAME ; void RadioStationCarousel::scrollToIndex(int, enum Scroll::Direction, class QFlags<enum RadioStationCarousel::ScrollFlag>)
+ ?updateItem@RadioFrequencyStrip@@AAEXPAVRadioFrequencyItem@@II@Z @ 4 NONAME ; void RadioFrequencyStrip::updateItem(class RadioFrequencyItem *, unsigned int, unsigned int)
+ ?qt_metacast@RadioFadingLabel@@UAEPAXPBD@Z @ 5 NONAME ; void * RadioFadingLabel::qt_metacast(char const *)
+ ?animateNewStation@RadioStationCarousel@@QAEXABVRadioStation@@@Z @ 6 NONAME ; void RadioStationCarousel::animateNewStation(class RadioStation const &)
+ ?gestureEvent@RadioStationCarousel@@EAEXPAVQGestureEvent@@@Z @ 7 NONAME ; void RadioStationCarousel::gestureEvent(class QGestureEvent *)
+ ?setFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 8 NONAME ; void RadioStationCarousel::setFavoriteIcon(class HbIcon const &)
+ ?update@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 9 NONAME ; void RadioStationCarousel::update(class RadioStation const &)
+ ?addFrequencyPos@RadioFrequencyStrip@@AAEXHIPAVRadioFrequencyItem@@@Z @ 10 NONAME ; void RadioFrequencyStrip::addFrequencyPos(int, unsigned int, class RadioFrequencyItem *)
+ ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *)
+ ?setScanningMode@RadioFrequencyStrip@@QAEX_N@Z @ 12 NONAME ; void RadioFrequencyStrip::setScanningMode(bool)
+ ?createItemPrimitive@RadioFrequencyStrip@@EAEPAVQGraphicsItem@@PAV2@@Z @ 13 NONAME ; class QGraphicsItem * RadioFrequencyStrip::createItemPrimitive(class QGraphicsItem *)
+ ?skipRequested@RadioStationCarousel@@IAEXH@Z @ 14 NONAME ; void RadioStationCarousel::skipRequested(int)
+ ?setTextWithoutFading@RadioFadingLabel@@QAEXABVQString@@@Z @ 15 NONAME ; void RadioFadingLabel::setTextWithoutFading(class QString const &)
+ ?updateAntennaStatus@RadioWindow@@AAEX_N@Z @ 16 NONAME ; void RadioWindow::updateAntennaStatus(bool)
+ ?resizeEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 17 NONAME ; void RadioFrequencyStrip::resizeEvent(class QGraphicsSceneResizeEvent *)
+ ?init@RadioFrequencyStrip@@QAEXPAVRadioUiEngine@@AAVRadioUiLoader@@@Z @ 18 NONAME ; void RadioFrequencyStrip::init(class RadioUiEngine *, class RadioUiLoader &)
+ ?initButtons@RadioFrequencyStrip@@AAEXXZ @ 19 NONAME ; void RadioFrequencyStrip::initButtons(void)
+ ?qt_metacall@RadioStationCarousel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int RadioStationCarousel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?isInitialized@RadioStationCarousel@@ABE_NXZ @ 21 NONAME ; bool RadioStationCarousel::isInitialized(void) const
+ ?init@RadioStationCarousel@@QAEXAAVRadioUiLoader@@PAVRadioUiEngine@@@Z @ 22 NONAME ; void RadioStationCarousel::init(class RadioUiLoader &, class RadioUiEngine *)
+ ?manualSeekChanged@RadioFrequencyStrip@@IAEX_N@Z @ 23 NONAME ; void RadioFrequencyStrip::manualSeekChanged(bool)
+ ?scrollPosChanged@RadioStationCarousel@@AAEXABVQPointF@@@Z @ 24 NONAME ; void RadioStationCarousel::scrollPosChanged(class QPointF const &)
+ ?frequencyChanged@RadioFrequencyStrip@@IAEXIHH@Z @ 25 NONAME ; void RadioFrequencyStrip::frequencyChanged(unsigned int, int, int)
+ ?setAutoScrollTime@RadioStationCarousel@@QAEXH@Z @ 26 NONAME ; void RadioStationCarousel::setAutoScrollTime(int)
+ ?prevIndex@RadioStationCarousel@@AAEHH@Z @ 27 NONAME ; int RadioStationCarousel::prevIndex(int)
+ ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *)
+ ?tr@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *)
+ ?skip@RadioStationCarousel@@AAEXW4Mode@StationSkip@@@Z @ 30 NONAME ; void RadioStationCarousel::skip(enum StationSkip::Mode)
+ ?selectorPos@RadioFrequencyStrip@@ABEHXZ @ 31 NONAME ; int RadioFrequencyStrip::selectorPos(void) const
+ ??1RadioWindow@@UAE@XZ @ 32 NONAME ; RadioWindow::~RadioWindow(void)
+ ?skipRequested@RadioFrequencyStrip@@IAEXH@Z @ 33 NONAME ; void RadioFrequencyStrip::skipRequested(int)
+ ?setText@RadioFadingLabel@@QAEXABVQString@@@Z @ 34 NONAME ; void RadioFadingLabel::setText(class QString const &)
+ ?showEvent@RadioStationCarousel@@EAEXPAVQShowEvent@@@Z @ 35 NONAME ; void RadioStationCarousel::showEvent(class QShowEvent *)
+ ?mousePressEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 36 NONAME ; void RadioStationCarousel::mousePressEvent(class QGraphicsSceneMouseEvent *)
+ ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 37 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *)
+ ?handleScrollingEnd@RadioFrequencyStrip@@AAEXXZ @ 38 NONAME ; void RadioFrequencyStrip::handleScrollingEnd(void)
+ ?favoriteIcon@RadioStationCarousel@@QBE?AVHbIcon@@XZ @ 39 NONAME ; class HbIcon RadioStationCarousel::favoriteIcon(void) const
+ ?activateView@RadioWindow@@AAEXPAVRadioViewBase@@ABVQString@@V?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 40 NONAME ; void RadioWindow::activateView(class RadioViewBase *, class QString const &, class QFlags<enum Hb::ViewSwitchFlag>)
+ ?calculateDifference@RadioStationCarousel@@AAEHHAAW4Direction@Scroll@@@Z @ 41 NONAME ; int RadioStationCarousel::calculateDifference(int, enum Scroll::Direction &)
+ ?orientationSection@RadioWindow@@QAE?AVQString@@XZ @ 42 NONAME ; class QString RadioWindow::orientationSection(void)
+ ?updateStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 43 NONAME ; void RadioFrequencyStrip::updateStation(class QModelIndex const &, int, int)
+ ??1RadioFrequencyStrip@@UAE@XZ @ 44 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(void)
+ ?queryOfflineUsage@RadioWindow@@AAEXW4Profile@QSystemDeviceInfo@QtMobility@@@Z @ 45 NONAME ; void RadioWindow::queryOfflineUsage(enum QtMobility::QSystemDeviceInfo::Profile)
+ ?cancelAnimation@RadioStationCarousel@@QAEXXZ @ 46 NONAME ; void RadioStationCarousel::cancelAnimation(void)
+ ?changeEvent@RadioFrequencyStrip@@EAEXPAVQEvent@@@Z @ 47 NONAME ; void RadioFrequencyStrip::changeEvent(class QEvent *)
+ ?staticMetaObject@RadioStationCarousel@@2UQMetaObject@@B @ 48 NONAME ; struct QMetaObject const RadioStationCarousel::staticMetaObject
+ ?qt_metacall@RadioFadingLabel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 49 NONAME ; int RadioFadingLabel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??0RadioFrequencyStrip@@QAE@XZ @ 50 NONAME ; RadioFrequencyStrip::RadioFrequencyStrip(void)
+ ?timerEvent@RadioFrequencyStrip@@EAEXPAVQTimerEvent@@@Z @ 51 NONAME ; void RadioFrequencyStrip::timerEvent(class QTimerEvent *)
+ ?setCenterIndex@RadioStationCarousel@@AAEXHV?$QFlags@W4ScrollFlag@RadioStationCarousel@@@@@Z @ 52 NONAME ; void RadioStationCarousel::setCenterIndex(int, class QFlags<enum RadioStationCarousel::ScrollFlag>)
+ ?resizeEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 53 NONAME ; void RadioStationCarousel::resizeEvent(class QGraphicsSceneResizeEvent *)
+ ?updateStations@RadioStationCarousel@@AAEXXZ @ 54 NONAME ; void RadioStationCarousel::updateStations(void)
+ ??_ERadioWindow@@UAE@I@Z @ 55 NONAME ; RadioWindow::~RadioWindow(unsigned int)
+ ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 56 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *)
+ ?initSelector@RadioFrequencyStrip@@AAEXXZ @ 57 NONAME ; void RadioFrequencyStrip::initSelector(void)
+ ?qt_metacall@RadioWindow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 58 NONAME ; int RadioWindow::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?qt_metacall@RadioFrequencyStrip@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int RadioFrequencyStrip::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?metaObject@RadioFrequencyStrip@@UBEPBUQMetaObject@@XZ @ 60 NONAME ; struct QMetaObject const * RadioFrequencyStrip::metaObject(void) const
+ ?startEffect@RadioFadingLabel@@AAEXABVQString@@PBD@Z @ 61 NONAME ; void RadioFadingLabel::startEffect(class QString const &, char const *)
+ ?setFrequency@RadioFrequencyStrip@@QAEXIHW4Direction@Scroll@@@Z @ 62 NONAME ; void RadioFrequencyStrip::setFrequency(unsigned int, int, enum Scroll::Direction)
+ ?activateHistoryView@RadioWindow@@QAEXXZ @ 63 NONAME ; void RadioWindow::activateHistoryView(void)
+ ??_ERadioStationCarousel@@UAE@I@Z @ 64 NONAME ; RadioStationCarousel::~RadioStationCarousel(unsigned int)
+ ?initPositions@RadioFrequencyStrip@@AAEXXZ @ 65 NONAME ; void RadioFrequencyStrip::initPositions(void)
+ ?tr@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 66 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *)
+ ?getStaticMetaObject@RadioFadingLabel@@SAABUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const & RadioFadingLabel::getStaticMetaObject(void)
+ ?setManualSeekMode@RadioStationCarousel@@QAEX_N@Z @ 68 NONAME ; void RadioStationCarousel::setManualSeekMode(bool)
+ ?qt_metacast@RadioWindow@@UAEPAXPBD@Z @ 69 NONAME ; void * RadioWindow::qt_metacast(char const *)
+ ?trimHtml@RadioFadingLabel@@AAE?AVQString@@ABV2@@Z @ 70 NONAME ; class QString RadioFadingLabel::trimHtml(class QString const &)
+ ?tr@RadioWindow@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString RadioWindow::tr(char const *, char const *)
+ ?mouseReleaseEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 72 NONAME ; void RadioFrequencyStrip::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
+ ?updateItemPrimitive@RadioFrequencyStrip@@EAEXPAVQGraphicsItem@@H@Z @ 73 NONAME ; void RadioFrequencyStrip::updateItemPrimitive(class QGraphicsItem *, int)
+ ?getStaticMetaObject@RadioFrequencyStrip@@SAABUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const & RadioFrequencyStrip::getStaticMetaObject(void)
+ ?showErrorMessage@RadioWindow@@QAEXABVQString@@@Z @ 75 NONAME ; void RadioWindow::showErrorMessage(class QString const &)
+ ??0RadioFadingLabel@@QAE@PAVQGraphicsItem@@@Z @ 76 NONAME ; RadioFadingLabel::RadioFadingLabel(class QGraphicsItem *)
+ ?updateStationsInRange@RadioFrequencyStrip@@AAEXHH_N@Z @ 77 NONAME ; void RadioFrequencyStrip::updateStationsInRange(int, int, bool)
+ ?initModel@RadioFrequencyStrip@@AAEXXZ @ 78 NONAME ; void RadioFrequencyStrip::initModel(void)
+ ?frequency@RadioFrequencyStrip@@QBEIXZ @ 79 NONAME ; unsigned int RadioFrequencyStrip::frequency(void) const
+ ??1RadioStationCarousel@@UAE@XZ @ 80 NONAME ; RadioStationCarousel::~RadioStationCarousel(void)
+ ??_ERadioFrequencyStrip@@UAE@I@Z @ 81 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(unsigned int)
+ ?setFadingEnabled@RadioFadingLabel@@QAEX_N@Z @ 82 NONAME ; void RadioFadingLabel::setFadingEnabled(bool)
+ ?mousePressEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 83 NONAME ; void RadioFrequencyStrip::mousePressEvent(class QGraphicsSceneMouseEvent *)
+ ?showVolumeLevel@RadioWindow@@AAEXH@Z @ 84 NONAME ; void RadioWindow::showVolumeLevel(int)
+ ?getStaticMetaObject@RadioWindow@@SAABUQMetaObject@@XZ @ 85 NONAME ; struct QMetaObject const & RadioWindow::getStaticMetaObject(void)
+ ?trUtf8@RadioWindow@@SA?AVQString@@PBD0@Z @ 86 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *)
+ ?timerFired@RadioStationCarousel@@AAEXXZ @ 87 NONAME ; void RadioStationCarousel::timerFired(void)
+ ?toggleManualSeek@RadioFrequencyStrip@@AAEXXZ @ 88 NONAME ; void RadioFrequencyStrip::toggleManualSeek(void)
+ ?drawPixmap@RadioFrequencyStrip@@AAE?AVQPixmap@@IV?$QList@VRadioStation@@@@PAVRadioFrequencyItem@@@Z @ 89 NONAME ; class QPixmap RadioFrequencyStrip::drawPixmap(unsigned int, class QList<class RadioStation>, class RadioFrequencyItem *)
+ ?initEmptyItems@RadioFrequencyStrip@@AAEXXZ @ 90 NONAME ; void RadioFrequencyStrip::initEmptyItems(void)
+ ??0RadioWindow@@QAE@PAVQWidget@@@Z @ 91 NONAME ; RadioWindow::RadioWindow(class QWidget *)
+ ?tr@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *, int)
+ ?toggleFavorite@RadioStationCarousel@@AAEXXZ @ 93 NONAME ; void RadioStationCarousel::toggleFavorite(void)
+ ?updateRadioText@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 94 NONAME ; void RadioStationCarousel::updateRadioText(class RadioStation const &)
+ ?updateAntennaStatus@RadioStationCarousel@@QAEX_N@Z @ 95 NONAME ; void RadioStationCarousel::updateAntennaStatus(bool)
+ ?updateFavorite@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 96 NONAME ; void RadioFrequencyStrip::updateFavorite(class RadioStation const &)
+ ?setFrequency@RadioStationCarousel@@QAEXIHW4Direction@Scroll@@@Z @ 97 NONAME ; void RadioStationCarousel::setFrequency(unsigned int, int, enum Scroll::Direction)
+ ?setInfoText@RadioStationCarousel@@QAEXW4Type@CarouselInfoText@@@Z @ 98 NONAME ; void RadioStationCarousel::setInfoText(enum CarouselInfoText::Type)
+ ?staticMetaObject@RadioFadingLabel@@2UQMetaObject@@B @ 99 NONAME ; struct QMetaObject const RadioFadingLabel::staticMetaObject
+ ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 100 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *, int)
+ ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 101 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *, int)
+ ?getStaticMetaObject@RadioStationCarousel@@SAABUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const & RadioStationCarousel::getStaticMetaObject(void)
+ ?metaObject@RadioFadingLabel@@UBEPBUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const * RadioFadingLabel::metaObject(void) const
+ ?metaObject@RadioWindow@@UBEPBUQMetaObject@@XZ @ 104 NONAME ; struct QMetaObject const * RadioWindow::metaObject(void) const
+ ?staticMetaObject@RadioFrequencyStrip@@2UQMetaObject@@B @ 105 NONAME ; struct QMetaObject const RadioFrequencyStrip::staticMetaObject
+ ?autoScrollTime@RadioStationCarousel@@QBEHXZ @ 106 NONAME ; int RadioStationCarousel::autoScrollTime(void) const
+ ?handleRightButton@RadioFrequencyStrip@@AAEXXZ @ 107 NONAME ; void RadioFrequencyStrip::handleRightButton(void)
+ ?qt_metacast@RadioStationCarousel@@UAEPAXPBD@Z @ 108 NONAME ; void * RadioStationCarousel::qt_metacast(char const *)
+ ?tr@RadioWindow@@SA?AVQString@@PBD0H@Z @ 109 NONAME ; class QString RadioWindow::tr(char const *, char const *, int)
+ ?addScannedStation@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 110 NONAME ; void RadioFrequencyStrip::addScannedStation(class RadioStation const &)
+ ?handleLongRightButton@RadioFrequencyStrip@@AAEXXZ @ 111 NONAME ; void RadioFrequencyStrip::handleLongRightButton(void)
+ ?seekRequested@RadioFrequencyStrip@@IAEXH@Z @ 112 NONAME ; void RadioFrequencyStrip::seekRequested(int)
+ ?isInManualSeekMode@RadioFrequencyStrip@@QBE_NXZ @ 113 NONAME ; bool RadioFrequencyStrip::isInManualSeekMode(void) const
+ ?scrollToFrequency@RadioFrequencyStrip@@AAEXIW4Direction@Scroll@@HW4Reason@TuneReason@@@Z @ 114 NONAME ; void RadioFrequencyStrip::scrollToFrequency(unsigned int, enum Scroll::Direction, int, enum TuneReason::Reason)
+ ??0RadioStationCarousel@@QAE@PAVQGraphicsItem@@@Z @ 115 NONAME ; RadioStationCarousel::RadioStationCarousel(class QGraphicsItem *)
+ ?adjustAfterScroll@RadioStationCarousel@@AAEXXZ @ 116 NONAME ; void RadioStationCarousel::adjustAfterScroll(void)
+ ?metaObject@RadioStationCarousel@@UBEPBUQMetaObject@@XZ @ 117 NONAME ; struct QMetaObject const * RadioStationCarousel::metaObject(void) const
+ ?effectFinished@RadioFadingLabel@@AAEXUEffectStatus@HbEffect@@@Z @ 118 NONAME ; void RadioFadingLabel::effectFinished(struct HbEffect::EffectStatus)
+ ?updateOrientation@RadioWindow@@AAEXW4Orientation@Qt@@@Z @ 119 NONAME ; void RadioWindow::updateOrientation(enum Qt::Orientation)
+ ?init@RadioWindow@@QAEXPAVQSystemDeviceInfo@QtMobility@@@Z @ 120 NONAME ; void RadioWindow::init(class QtMobility::QSystemDeviceInfo *)
+ ?nonFavoriteIcon@RadioStationCarousel@@QBE?AVHbIcon@@XZ @ 121 NONAME ; class HbIcon RadioStationCarousel::nonFavoriteIcon(void) const
+ ?showButtons@RadioFrequencyStrip@@AAEXXZ @ 122 NONAME ; void RadioFrequencyStrip::showButtons(void)
+ ?uiEngine@RadioStationCarousel@@QAEPAVRadioUiEngine@@XZ @ 123 NONAME ; class RadioUiEngine * RadioStationCarousel::uiEngine(void)
+ ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 124 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *, int)
+ ?activateMainView@RadioWindow@@QAEXXZ @ 125 NONAME ; void RadioWindow::activateMainView(void)
+ ?scrollPosChanged@RadioFrequencyStrip@@EAEXVQPointF@@@Z @ 126 NONAME ; void RadioFrequencyStrip::scrollPosChanged(class QPointF)
+ ?setScanningMode@RadioStationCarousel@@QAEX_N@Z @ 127 NONAME ; void RadioStationCarousel::setScanningMode(bool)
+ ??1RadioFadingLabel@@UAE@XZ @ 128 NONAME ; RadioFadingLabel::~RadioFadingLabel(void)
+ ?setNonFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 129 NONAME ; void RadioStationCarousel::setNonFavoriteIcon(class HbIcon const &)
+ ?isInScanningMode@RadioStationCarousel@@QBE_NXZ @ 130 NONAME ; bool RadioStationCarousel::isInScanningMode(void) const
+ ?isAntennaAttached@RadioStationCarousel@@QBE_NXZ @ 131 NONAME ; bool RadioStationCarousel::isAntennaAttached(void) const
+ ?activateStationsView@RadioWindow@@QAEXXZ @ 132 NONAME ; void RadioWindow::activateStationsView(void)
+ ?removeStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 133 NONAME ; void RadioFrequencyStrip::removeStation(class QModelIndex const &, int, int)
+ ?tr@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *, int)
+ ?trimIndex@RadioStationCarousel@@AAEHH@Z @ 135 NONAME ; int RadioStationCarousel::trimIndex(int)
+ ?frequencyChanged@RadioStationCarousel@@IAEXIHH@Z @ 136 NONAME ; void RadioStationCarousel::frequencyChanged(unsigned int, int, int)
+ ?setAlternateSkippingMode@RadioStationCarousel@@QAEX_N@Z @ 137 NONAME ; void RadioStationCarousel::setAlternateSkippingMode(bool)
+ ?initView@RadioWindow@@AAEXXZ @ 138 NONAME ; void RadioWindow::initView(void)
+ ?gestureEvent@RadioFrequencyStrip@@EAEXPAVQGestureEvent@@@Z @ 139 NONAME ; void RadioFrequencyStrip::gestureEvent(class QGestureEvent *)
+ ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 140 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *, int)
+ ?handleLongLeftButton@RadioFrequencyStrip@@AAEXXZ @ 141 NONAME ; void RadioFrequencyStrip::handleLongLeftButton(void)
+ ?hideButtons@RadioFrequencyStrip@@AAEXXZ @ 142 NONAME ; void RadioFrequencyStrip::hideButtons(void)
+ ?emitFrequencyChanged@RadioFrequencyStrip@@AAEXI@Z @ 143 NONAME ; void RadioFrequencyStrip::emitFrequencyChanged(unsigned int)
+ ?handleLeftButton@RadioFrequencyStrip@@AAEXXZ @ 144 NONAME ; void RadioFrequencyStrip::handleLeftButton(void)
+ ??_ERadioFadingLabel@@UAE@I@Z @ 145 NONAME ; RadioFadingLabel::~RadioFadingLabel(unsigned int)
+ ?cancelManualSeek@RadioFrequencyStrip@@QAEXXZ @ 146 NONAME ; void RadioFrequencyStrip::cancelManualSeek(void)
+ ?isScrollingAllowed@RadioStationCarousel@@ABE_NXZ @ 147 NONAME ; bool RadioStationCarousel::isScrollingAllowed(void) const
+ ?qt_metacast@RadioFrequencyStrip@@UAEPAXPBD@Z @ 148 NONAME ; void * RadioFrequencyStrip::qt_metacast(char const *)
+ ?staticMetaObject@RadioWindow@@2UQMetaObject@@B @ 149 NONAME ; struct QMetaObject const RadioWindow::staticMetaObject
+ ?cleanRdsData@RadioStationCarousel@@QAEXXZ @ 150 NONAME ; void RadioStationCarousel::cleanRdsData(void)
+ ?clearInfoText@RadioStationCarousel@@QAEXXZ @ 151 NONAME ; void RadioStationCarousel::clearInfoText(void)
+ ?updateAllItems@RadioFrequencyStrip@@AAEXXZ @ 152 NONAME ; void RadioFrequencyStrip::updateAllItems(void)
+ ?adjustPos@RadioStationCarousel@@AAEXH@Z @ 153 NONAME ; void RadioStationCarousel::adjustPos(int)
+ ?scanAnimationFinished@RadioStationCarousel@@IAEXXZ @ 154 NONAME ; void RadioStationCarousel::scanAnimationFinished(void)
+
--- a/radioapp/bwins/radioenginewrapperu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-EXPORTS
- ?skipPrevious@RadioEngineWrapperObserver@@UAEXXZ @ 1 NONAME ; void RadioEngineWrapperObserver::skipPrevious(void)
- ?volumeChanged@RadioEngineWrapperObserver@@UAEXH@Z @ 2 NONAME ; void RadioEngineWrapperObserver::volumeChanged(int)
- ?settings@RadioEngineWrapper@@QAEAAVRadioSettingsIf@@XZ @ 3 NONAME ; class RadioSettingsIf & RadioEngineWrapper::settings(void)
- ?region@RadioEngineWrapper@@QBE?AW4Region@RadioRegion@@XZ @ 4 NONAME ; enum RadioRegion::Region RadioEngineWrapper::region(void) const
- ?tuneFrequency@RadioEngineWrapper@@QAEXIH@Z @ 5 NONAME ; void RadioEngineWrapper::tuneFrequency(unsigned int, int)
- ?initCombinedLogger@RadioLogger@@SAXXZ @ 6 NONAME ; void RadioLogger::initCombinedLogger(void)
- ?removeObserver@RadioEngineWrapper@@QAEXPAVRadioEngineWrapperObserver@@@Z @ 7 NONAME ; void RadioEngineWrapper::removeObserver(class RadioEngineWrapperObserver *)
- ?startSeeking@RadioEngineWrapper@@QAEXW4Direction@Seeking@@H@Z @ 8 NONAME ; void RadioEngineWrapper::startSeeking(enum Seeking::Direction, int)
- ?isRadioOn@RadioEngineWrapper@@QBE_NXZ @ 9 NONAME ; bool RadioEngineWrapper::isRadioOn(void) const
- ?addObserver@RadioEngineWrapper@@QAEXPAVRadioEngineWrapperObserver@@@Z @ 10 NONAME ; void RadioEngineWrapper::addObserver(class RadioEngineWrapperObserver *)
- ?isAntennaAttached@RadioEngineWrapper@@QBE_NXZ @ 11 NONAME ; bool RadioEngineWrapper::isAntennaAttached(void) const
- ?isEngineConstructed@RadioEngineWrapper@@QAE_NXZ @ 12 NONAME ; bool RadioEngineWrapper::isEngineConstructed(void)
- ?toggleAudioRoute@RadioEngineWrapper@@QAEXXZ @ 13 NONAME ; void RadioEngineWrapper::toggleAudioRoute(void)
- ?setVolume@RadioEngineWrapper@@QAEXH@Z @ 14 NONAME ; void RadioEngineWrapper::setVolume(int)
- ??0RadioEngineWrapper@@QAE@AAVRadioStationHandlerIf@@@Z @ 15 NONAME ; RadioEngineWrapper::RadioEngineWrapper(class RadioStationHandlerIf &)
- ?cancelSeeking@RadioEngineWrapper@@QAEXXZ @ 16 NONAME ; void RadioEngineWrapper::cancelSeeking(void)
- ?d_func@RadioEngineWrapper@@AAEPAVRadioEngineWrapperPrivate@@XZ @ 17 NONAME ; class RadioEngineWrapperPrivate * RadioEngineWrapper::d_func(void)
- ?d_func@RadioEngineWrapper@@ABEPBVRadioEngineWrapperPrivate@@XZ @ 18 NONAME ; class RadioEngineWrapperPrivate const * RadioEngineWrapper::d_func(void) const
- ?setMute@RadioEngineWrapper@@QAEX_N@Z @ 19 NONAME ; void RadioEngineWrapper::setMute(bool)
- ?releaseCombinedLogger@RadioLogger@@SAXXZ @ 20 NONAME ; void RadioLogger::releaseCombinedLogger(void)
- ??1RadioEngineWrapper@@QAE@XZ @ 21 NONAME ; RadioEngineWrapper::~RadioEngineWrapper(void)
- ?radioStatusChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 22 NONAME ; void RadioEngineWrapperObserver::radioStatusChanged(bool)
- ?frequencyStepSize@RadioEngineWrapper@@QBEIXZ @ 23 NONAME ; unsigned int RadioEngineWrapper::frequencyStepSize(void) const
- ??0MethodLogger@@QAE@PBD0@Z @ 24 NONAME ; MethodLogger::MethodLogger(char const *, char const *)
- ?logMsg@RadioLogger@@SAXPBDW4Mode@1@@Z @ 25 NONAME ; void RadioLogger::logMsg(char const *, enum RadioLogger::Mode)
- ?audioRouteChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 26 NONAME ; void RadioEngineWrapperObserver::audioRouteChanged(bool)
- ?isMuted@RadioEngineWrapper@@QBE_NXZ @ 27 NONAME ; bool RadioEngineWrapper::isMuted(void) const
- ?isUsingLoudspeaker@RadioEngineWrapper@@QBE_NXZ @ 28 NONAME ; bool RadioEngineWrapper::isUsingLoudspeaker(void) const
- ?currentFrequency@RadioEngineWrapper@@QBEIXZ @ 29 NONAME ; unsigned int RadioEngineWrapper::currentFrequency(void) const
- ?skipNext@RadioEngineWrapperObserver@@UAEXXZ @ 30 NONAME ; void RadioEngineWrapperObserver::skipNext(void)
- ?muteChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 31 NONAME ; void RadioEngineWrapperObserver::muteChanged(bool)
- ?isFrequencyValid@RadioEngineWrapper@@QAE_NI@Z @ 32 NONAME ; bool RadioEngineWrapper::isFrequencyValid(unsigned int)
- ?minFrequency@RadioEngineWrapper@@QBEIXZ @ 33 NONAME ; unsigned int RadioEngineWrapper::minFrequency(void) const
- ?rdsAvailabilityChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 34 NONAME ; void RadioEngineWrapperObserver::rdsAvailabilityChanged(bool)
- ?tunedToFrequency@RadioEngineWrapperObserver@@UAEXIH@Z @ 35 NONAME ; void RadioEngineWrapperObserver::tunedToFrequency(unsigned int, int)
- ?tuneWithDelay@RadioEngineWrapper@@QAEXIH@Z @ 36 NONAME ; void RadioEngineWrapper::tuneWithDelay(unsigned int, int)
- ??1MethodLogger@@QAE@XZ @ 37 NONAME ; MethodLogger::~MethodLogger(void)
- ?antennaStatusChanged@RadioEngineWrapperObserver@@UAEX_N@Z @ 38 NONAME ; void RadioEngineWrapperObserver::antennaStatusChanged(bool)
- ?maxFrequency@RadioEngineWrapper@@QBEIXZ @ 39 NONAME ; unsigned int RadioEngineWrapper::maxFrequency(void) const
-
--- a/radioapp/bwins/radiopresetstorageu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXPORTS
- ??1RadioPresetStorage@@QAE@XZ @ 1 NONAME ; RadioPresetStorage::~RadioPresetStorage(void)
- ?savePreset@RadioPresetStorage@@QAE_NABVRadioStationIf@@@Z @ 2 NONAME ; bool RadioPresetStorage::savePreset(class RadioStationIf const &)
- ?maxNumberOfPresets@RadioPresetStorage@@QBEHXZ @ 3 NONAME ; int RadioPresetStorage::maxNumberOfPresets(void) const
- ??0RadioPresetStorage@@QAE@XZ @ 4 NONAME ; RadioPresetStorage::RadioPresetStorage(void)
- ?nextPreset@RadioPresetStorage@@QBEHH@Z @ 5 NONAME ; int RadioPresetStorage::nextPreset(int) const
- ?deletePreset@RadioPresetStorage@@QAE_NH@Z @ 6 NONAME ; bool RadioPresetStorage::deletePreset(int)
- ?firstPreset@RadioPresetStorage@@QBEHXZ @ 7 NONAME ; int RadioPresetStorage::firstPreset(void) const
- ?readPreset@RadioPresetStorage@@QAE_NHAAVRadioStationIf@@@Z @ 8 NONAME ; bool RadioPresetStorage::readPreset(int, class RadioStationIf &)
- ?presetCount@RadioPresetStorage@@QBEHXZ @ 9 NONAME ; int RadioPresetStorage::presetCount(void) const
- ?d_func@RadioPresetStorage@@AAEPAVRadioPresetStoragePrivate@@XZ @ 10 NONAME ; class RadioPresetStoragePrivate * RadioPresetStorage::d_func(void)
- ?d_func@RadioPresetStorage@@ABEPBVRadioPresetStoragePrivate@@XZ @ 11 NONAME ; class RadioPresetStoragePrivate const * RadioPresetStorage::d_func(void) const
-
--- a/radioapp/bwins/radiouiengineu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,279 +0,0 @@
-EXPORTS
- ?setFrequency@RadioHistoryItem@@QAEXI@Z @ 1 NONAME ; void RadioHistoryItem::setFrequency(unsigned int)
- ?qt_metacast@RadioUiEngine@@UAEPAXPBD@Z @ 2 NONAME ; void * RadioUiEngine::qt_metacast(char const *)
- ?index@RadioStationFilterModel@@UBE?AVQModelIndex@@HHABV2@@Z @ 3 NONAME ; class QModelIndex RadioStationFilterModel::index(int, int, class QModelIndex const &) const
- ?parseFrequency@RadioStation@@SA?AVQString@@I@Z @ 4 NONAME ; class QString RadioStation::parseFrequency(unsigned int)
- ??0RadioStation@@QAE@ABV0@@Z @ 5 NONAME ; RadioStation::RadioStation(class RadioStation const &)
- ?frequency@RadioStation@@QBEIXZ @ 6 NONAME ; unsigned int RadioStation::frequency(void) const
- ?setFavoriteByFrequency@RadioStationModel@@QAEXI_N@Z @ 7 NONAME ; void RadioStationModel::setFavoriteByFrequency(unsigned int, bool)
- ??_ERadioHistoryItem@@UAE@I@Z @ 8 NONAME ; RadioHistoryItem::~RadioHistoryItem(unsigned int)
- ?staticMetaObject@RadioUiEngine@@2UQMetaObject@@B @ 9 NONAME ; struct QMetaObject const RadioUiEngine::staticMetaObject
- ?setName@RadioStation@@QAEXABVQString@@@Z @ 10 NONAME ; void RadioStation::setName(class QString const &)
- ?qt_metacast@RadioCarouselModel@@UAEPAXPBD@Z @ 11 NONAME ; void * RadioCarouselModel::qt_metacast(char const *)
- ?setFavoriteByPreset@RadioStationModel@@QAEXH_N@Z @ 12 NONAME ; void RadioStationModel::setFavoriteByPreset(int, bool)
- ?decrementReferenceCount@RadioHistoryItem@@AAEXXZ @ 13 NONAME ; void RadioHistoryItem::decrementReferenceCount(void)
- ?qt_metacall@RadioHistoryModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 14 NONAME ; int RadioHistoryModel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?emitVolumeChanged@RadioUiEngine@@AAEXH@Z @ 15 NONAME ; void RadioUiEngine::emitVolumeChanged(int)
- ?qt_metacall@RadioUiEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 16 NONAME ; int RadioUiEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?addItem@RadioHistoryModel@@AAEXABVQString@@0ABVRadioStation@@@Z @ 17 NONAME ; void RadioHistoryModel::addItem(class QString const &, class QString const &, class RadioStation const &)
- ?trUtf8@RadioCarouselModel@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString RadioCarouselModel::trUtf8(char const *, char const *, int)
- ?setGenre@RadioStation@@QAEXH@Z @ 19 NONAME ; void RadioStation::setGenre(int)
- ??4RadioStation@@QAEAAV0@ABV0@@Z @ 20 NONAME ; class RadioStation & RadioStation::operator=(class RadioStation const &)
- ?stationModel@RadioUiEngine@@QAEAAVRadioStationModel@@XZ @ 21 NONAME ; class RadioStationModel & RadioUiEngine::stationModel(void)
- ?toggleTagging@RadioHistoryModel@@QAEXABVRadioHistoryItem@@H@Z @ 22 NONAME ; void RadioHistoryModel::toggleTagging(class RadioHistoryItem const &, int)
- ?muteChanged@RadioUiEngine@@IAEX_N@Z @ 23 NONAME ; void RadioUiEngine::muteChanged(bool)
- ?maxFrequency@RadioUiEngine@@QBEIXZ @ 24 NONAME ; unsigned int RadioUiEngine::maxFrequency(void) const
- ?saveStation@RadioStationModel@@QAEXAAVRadioStation@@@Z @ 25 NONAME ; void RadioStationModel::saveStation(class RadioStation &)
- ?hasChanged@RadioStation@@QBE_NXZ @ 26 NONAME ; bool RadioStation::hasChanged(void) const
- ??0RadioCarouselModel@@AAE@AAVRadioUiEngine@@AAVRadioStationModel@@@Z @ 27 NONAME ; RadioCarouselModel::RadioCarouselModel(class RadioUiEngine &, class RadioStationModel &)
- ?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 28 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *, int)
- ?isScanning@RadioUiEngine@@QBE_NXZ @ 29 NONAME ; bool RadioUiEngine::isScanning(void) const
- ?d_func@RadioHistoryModel@@AAEPAVRadioHistoryModelPrivate@@XZ @ 30 NONAME ; class RadioHistoryModelPrivate * RadioHistoryModel::d_func(void)
- ?piCodeToCallSign@RadioStation@@AAE?AVQString@@I@Z @ 31 NONAME ; class QString RadioStation::piCodeToCallSign(unsigned int)
- ?hasLooped@RadioStationFilterModel@@QBE_NABVQModelIndex@@@Z @ 32 NONAME ; bool RadioStationFilterModel::hasLooped(class QModelIndex const &) const
- ?favoriteChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 33 NONAME ; void RadioStationModel::favoriteChanged(class RadioStation const &)
- ?radioStatusChanged@RadioUiEngine@@IAEX_N@Z @ 34 NONAME ; void RadioUiEngine::radioStatusChanged(bool)
- ?setIcons@RadioHistoryModel@@QAEXABVQIcon@@0@Z @ 35 NONAME ; void RadioHistoryModel::setIcons(class QIcon const &, class QIcon const &)
- ?isCurrentSongRecognized@RadioHistoryModel@@QBE_NXZ @ 36 NONAME ; bool RadioHistoryModel::isCurrentSongRecognized(void) const
- ?clearRadioTextPlus@RadioHistoryModel@@AAEXXZ @ 37 NONAME ; void RadioHistoryModel::clearRadioTextPlus(void)
- ?addStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 38 NONAME ; void RadioStationModel::addStation(class RadioStation const &)
- ?favoriteCount@RadioStationModel@@QAEHXZ @ 39 NONAME ; int RadioStationModel::favoriteCount(void)
- ?createNewFilterModel@RadioUiEngine@@QAEPAVRadioStationFilterModel@@PAVQObject@@@Z @ 40 NONAME ; class RadioStationFilterModel * RadioUiEngine::createNewFilterModel(class QObject *)
- ??1RadioScannerEngine@@UAE@XZ @ 41 NONAME ; RadioScannerEngine::~RadioScannerEngine(void)
- ?isScanning@RadioScannerEngine@@QBE_NXZ @ 42 NONAME ; bool RadioScannerEngine::isScanning(void) const
- ?tunePreset@RadioUiEngine@@QAEXH@Z @ 43 NONAME ; void RadioUiEngine::tunePreset(int)
- ?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 44 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *)
- ?emitDataChanged@RadioStationModel@@AAEXABVRadioStation@@@Z @ 45 NONAME ; void RadioStationModel::emitDataChanged(class RadioStation const &)
- ?isRadioOn@RadioUiEngine@@QBE_NXZ @ 46 NONAME ; bool RadioUiEngine::isRadioOn(void) const
- ?continueScanning@RadioScannerEngine@@QAEXXZ @ 47 NONAME ; void RadioScannerEngine::continueScanning(void)
- ?modelIndexFromFrequency@RadioStationModel@@QAE?AVQModelIndex@@I@Z @ 48 NONAME ; class QModelIndex RadioStationModel::modelIndexFromFrequency(unsigned int)
- ?list@RadioStationModel@@QBEABV?$QMap@IVRadioStation@@@@XZ @ 49 NONAME ; class QMap<unsigned int, class RadioStation> const & RadioStationModel::list(void) const
- ?tr@RadioStationModel@@SA?AVQString@@PBD0@Z @ 50 NONAME ; class QString RadioStationModel::tr(char const *, char const *)
- ?tr@RadioCarouselModel@@SA?AVQString@@PBD0H@Z @ 51 NONAME ; class QString RadioCarouselModel::tr(char const *, char const *, int)
- ?setChangeFlags@RadioStation@@QAEXV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 52 NONAME ; void RadioStation::setChangeFlags(class QFlags<enum RadioStation::ChangeFlag>)
- ?hasRds@RadioStation@@QBE_NXZ @ 53 NONAME ; bool RadioStation::hasRds(void) const
- ?findClosest@RadioStationModel@@QAE?AVRadioStation@@IW4Mode@StationSkip@@@Z @ 54 NONAME ; class RadioStation RadioStationModel::findClosest(unsigned int, enum StationSkip::Mode)
- ?flags@RadioStationModel@@UBE?AV?$QFlags@W4ItemFlag@Qt@@@@ABVQModelIndex@@@Z @ 55 NONAME ; class QFlags<enum Qt::ItemFlag> RadioStationModel::flags(class QModelIndex const &) const
- ?id@RadioHistoryItem@@QBEHXZ @ 56 NONAME ; int RadioHistoryItem::id(void) const
- ?stationsInRange@RadioUiEngine@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 57 NONAME ; class QList<class RadioStation> RadioUiEngine::stationsInRange(unsigned int, unsigned int)
- ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0@Z @ 58 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *)
- ?tr@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 59 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *, int)
- ??_ERadioCarouselModel@@UAE@I@Z @ 60 NONAME ; RadioCarouselModel::~RadioCarouselModel(unsigned int)
- ??0RadioStation@@QAE@HI@Z @ 61 NONAME ; RadioStation::RadioStation(int, unsigned int)
- ?setVolume@RadioUiEngine@@QAEXH@Z @ 62 NONAME ; void RadioUiEngine::setVolume(int)
- ?setFavorite@RadioStation@@QAEX_N@Z @ 63 NONAME ; void RadioStation::setFavorite(bool)
- ?d_func@RadioStationModel@@ABEPBVRadioStationModelPrivate@@XZ @ 64 NONAME ; class RadioStationModelPrivate const * RadioStationModel::d_func(void) const
- ?setCyclic@RadioStationFilterModel@@QAEX_N@Z @ 65 NONAME ; void RadioStationFilterModel::setCyclic(bool)
- ??1RadioStationModel@@UAE@XZ @ 66 NONAME ; RadioStationModel::~RadioStationModel(void)
- ?isMuted@RadioUiEngine@@QBE_NXZ @ 67 NONAME ; bool RadioUiEngine::isMuted(void) const
- ?isValid@RadioStation@@QBE_NXZ @ 68 NONAME ; bool RadioStation::isValid(void) const
- ?isEqual@RadioStationFilterModel@@QBE_NABVQModelIndex@@0@Z @ 69 NONAME ; bool RadioStationFilterModel::isEqual(class QModelIndex const &, class QModelIndex const &) const
- ?decrementReferenceCount@RadioStation@@AAEXXZ @ 70 NONAME ; void RadioStation::decrementReferenceCount(void)
- ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 71 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *, int)
- ?reset@RadioHistoryItem@@QAEXXZ @ 72 NONAME ; void RadioHistoryItem::reset(void)
- ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *)
- ??0RadioStationModel@@QAE@AAVRadioUiEnginePrivate@@@Z @ 74 NONAME ; RadioStationModel::RadioStationModel(class RadioUiEnginePrivate &)
- ?tuneFrequency@RadioUiEngine@@QAEXIH@Z @ 75 NONAME ; void RadioUiEngine::tuneFrequency(unsigned int, int)
- ?frequency@RadioHistoryItem@@QBEIXZ @ 76 NONAME ; unsigned int RadioHistoryItem::frequency(void) const
- ?qt_metacall@RadioScannerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int RadioScannerEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?emitTunedToFrequency@RadioUiEngine@@AAEXIH@Z @ 78 NONAME ; void RadioUiEngine::emitTunedToFrequency(unsigned int, int)
- ?psType@RadioStation@@QBE?AV?$QFlags@W4PsTypeFlag@RadioStation@@@@XZ @ 79 NONAME ; class QFlags<enum RadioStation::PsTypeFlag> RadioStation::psType(void) const
- ?d_func@RadioUiEngine@@ABEPBVRadioUiEnginePrivate@@XZ @ 80 NONAME ; class RadioUiEnginePrivate const * RadioUiEngine::d_func(void) const
- ?rowCount@RadioCarouselModel@@UBEHABVQModelIndex@@@Z @ 81 NONAME ; int RadioCarouselModel::rowCount(class QModelIndex const &) const
- ?scannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 82 NONAME ; class RadioScannerEngine * RadioUiEngine::scannerEngine(void)
- ?startScanning@RadioScannerEngine@@QAEXXZ @ 83 NONAME ; void RadioScannerEngine::startScanning(void)
- ?emitStationFound@RadioScannerEngine@@AAEXABVRadioStation@@@Z @ 84 NONAME ; void RadioScannerEngine::emitStationFound(class RadioStation const &)
- ?findCurrentStation@RadioStationModel@@AAE?AVRadioStation@@I@Z @ 85 NONAME ; class RadioStation RadioStationModel::findCurrentStation(unsigned int)
- ??4RadioHistoryItem@@QAEAAV0@ABV0@@Z @ 86 NONAME ; class RadioHistoryItem & RadioHistoryItem::operator=(class RadioHistoryItem const &)
- ?url@RadioStation@@QBE?AVQString@@XZ @ 87 NONAME ; class QString RadioStation::url(void) const
- ?historyModel@RadioUiEngine@@QAEAAVRadioHistoryModel@@XZ @ 88 NONAME ; class RadioHistoryModel & RadioUiEngine::historyModel(void)
- ?frequencyMhz@RadioStation@@QBE?AVQString@@XZ @ 89 NONAME ; class QString RadioStation::frequencyMhz(void) const
- ?setStation@RadioHistoryItem@@QAEXABVQString@@@Z @ 90 NONAME ; void RadioHistoryItem::setStation(class QString const &)
- ?qt_metacast@RadioStationModel@@UAEPAXPBD@Z @ 91 NONAME ; void * RadioStationModel::qt_metacast(char const *)
- ?getStaticMetaObject@RadioCarouselModel@@SAABUQMetaObject@@XZ @ 92 NONAME ; struct QMetaObject const & RadioCarouselModel::getStaticMetaObject(void)
- ?filterAcceptsRow@RadioStationFilterModel@@EBE_NHABVQModelIndex@@@Z @ 93 NONAME ; bool RadioStationFilterModel::filterAcceptsRow(int, class QModelIndex const &) const
- ?cancel@RadioScannerEngine@@QAEXXZ @ 94 NONAME ; void RadioScannerEngine::cancel(void)
- ?addRecognizedSong@RadioUiEngine@@QAEXABVQString@@0ABVRadioStation@@@Z @ 95 NONAME ; void RadioUiEngine::addRecognizedSong(class QString const &, class QString const &, class RadioStation const &)
- ?emitMuteChanged@RadioUiEngine@@AAEX_N@Z @ 96 NONAME ; void RadioUiEngine::emitMuteChanged(bool)
- ?removeByPresetIndex@RadioStationModel@@QAEXH@Z @ 97 NONAME ; void RadioStationModel::removeByPresetIndex(int)
- ?d_func@RadioScannerEngine@@AAEPAVRadioScannerEnginePrivate@@XZ @ 98 NONAME ; class RadioScannerEnginePrivate * RadioScannerEngine::d_func(void)
- ?stationAt@RadioStationModel@@QBE?AVRadioStation@@H@Z @ 99 NONAME ; class RadioStation RadioStationModel::stationAt(int) const
- ?dynamicPsChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 100 NONAME ; void RadioStationModel::dynamicPsChanged(class RadioStation const &)
- ?setType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 101 NONAME ; void RadioStation::setType(class QFlags<enum RadioStation::TypeFlag>)
- ??0RadioHistoryItem@@QAE@XZ @ 102 NONAME ; RadioHistoryItem::RadioHistoryItem(void)
- ?findPresetIndex@RadioStationModel@@QAEHH@Z @ 103 NONAME ; int RadioStationModel::findPresetIndex(int)
- ?setRadioTextPlus@RadioStation@@QAEXHABVQString@@@Z @ 104 NONAME ; void RadioStation::setRadioTextPlus(int, class QString const &)
- ?metaObject@RadioStationModel@@UBEPBUQMetaObject@@XZ @ 105 NONAME ; struct QMetaObject const * RadioStationModel::metaObject(void) const
- ?getStaticMetaObject@RadioStationModel@@SAABUQMetaObject@@XZ @ 106 NONAME ; struct QMetaObject const & RadioStationModel::getStaticMetaObject(void)
- ?tr@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 107 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *)
- ?dynamicPsText@RadioStation@@QBE?AVQString@@XZ @ 108 NONAME ; class QString RadioStation::dynamicPsText(void) const
- ?isFirstTimeStart@RadioUiEngine@@QAE_NXZ @ 109 NONAME ; bool RadioUiEngine::isFirstTimeStart(void)
- ?setMute@RadioUiEngine@@QAEX_N@Z @ 110 NONAME ; void RadioUiEngine::setMute(bool)
- ?init@RadioUiEngine@@QAE_NXZ @ 111 NONAME ; bool RadioUiEngine::init(void)
- ?changeFlags@RadioStation@@QBE?AV?$QFlags@W4ChangeFlag@RadioStation@@@@XZ @ 112 NONAME ; class QFlags<enum RadioStation::ChangeFlag> RadioStation::changeFlags(void) const
- ?qt_metacast@RadioHistoryModel@@UAEPAXPBD@Z @ 113 NONAME ; void * RadioHistoryModel::qt_metacast(char const *)
- ??1RadioUiEngine@@UAE@XZ @ 114 NONAME ; RadioUiEngine::~RadioUiEngine(void)
- ?tr@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 115 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *)
- ?metaObject@RadioCarouselModel@@UBEPBUQMetaObject@@XZ @ 116 NONAME ; struct QMetaObject const * RadioCarouselModel::metaObject(void) const
- ?d_func@RadioCarouselModel@@AAEPAVRadioCarouselModelPrivate@@XZ @ 117 NONAME ; class RadioCarouselModelPrivate * RadioCarouselModel::d_func(void)
- ?initialize@RadioStationModel@@QAEXPAVRadioPresetStorage@@PAVRadioEngineWrapper@@@Z @ 118 NONAME ; void RadioStationModel::initialize(class RadioPresetStorage *, class RadioEngineWrapper *)
- ?resetCurrentSong@RadioHistoryModel@@QAEXXZ @ 119 NONAME ; void RadioHistoryModel::resetCurrentSong(void)
- ?d_func@RadioHistoryModel@@ABEPBVRadioHistoryModelPrivate@@XZ @ 120 NONAME ; class RadioHistoryModelPrivate const * RadioHistoryModel::d_func(void) const
- ?stationFound@RadioScannerEngine@@IAEXABVRadioStation@@@Z @ 121 NONAME ; void RadioScannerEngine::stationFound(class RadioStation const &)
- ?resetChangeFlags@RadioStation@@QAEXXZ @ 122 NONAME ; void RadioStation::resetChangeFlags(void)
- ??_ERadioStationFilterModel@@UAE@I@Z @ 123 NONAME ; RadioStationFilterModel::~RadioStationFilterModel(unsigned int)
- ?metaObject@RadioScannerEngine@@UBEPBUQMetaObject@@XZ @ 124 NONAME ; struct QMetaObject const * RadioScannerEngine::metaObject(void) const
- ?callSignChar@RadioStation@@AAEDI@Z @ 125 NONAME ; char RadioStation::callSignChar(unsigned int)
- ??_ERadioStation@@UAE@I@Z @ 126 NONAME ; RadioStation::~RadioStation(unsigned int)
- ?detach@RadioHistoryItem@@QAEXXZ @ 127 NONAME ; void RadioHistoryItem::detach(void)
- ?staticMetaObject@RadioHistoryModel@@2UQMetaObject@@B @ 128 NONAME ; struct QMetaObject const RadioHistoryModel::staticMetaObject
- ?isDetached@RadioStation@@QBE_NXZ @ 129 NONAME ; bool RadioStation::isDetached(void) const
- ??0RadioHistoryItem@@QAE@ABVQString@@0@Z @ 130 NONAME ; RadioHistoryItem::RadioHistoryItem(class QString const &, class QString const &)
- ?removeAll@RadioStationModel@@QAEXW4RemoveMode@1@@Z @ 131 NONAME ; void RadioStationModel::removeAll(enum RadioStationModel::RemoveMode)
- ?data_ptr@RadioHistoryItem@@QAEAAPAVRadioHistoryItemPrivate@@XZ @ 132 NONAME ; class RadioHistoryItemPrivate * & RadioHistoryItem::data_ptr(void)
- ?setShowDetails@RadioHistoryModel@@QAEX_N@Z @ 133 NONAME ; void RadioHistoryModel::setShowDetails(bool)
- ?rowCount@RadioStationModel@@UBEHABVQModelIndex@@@Z @ 134 NONAME ; int RadioStationModel::rowCount(class QModelIndex const &) const
- ?toggleMute@RadioUiEngine@@QAEXXZ @ 135 NONAME ; void RadioUiEngine::toggleMute(void)
- ?genreToString@RadioUiEngine@@QAE?AVQString@@HW4Target@GenreTarget@@@Z @ 136 NONAME ; class QString RadioUiEngine::genreToString(int, enum GenreTarget::Target)
- ?d_func@RadioUiEngine@@AAEPAVRadioUiEnginePrivate@@XZ @ 137 NONAME ; class RadioUiEnginePrivate * RadioUiEngine::d_func(void)
- ?station@RadioHistoryItem@@QBE?AVQString@@XZ @ 138 NONAME ; class QString RadioHistoryItem::station(void) const
- ??_ERadioHistoryModel@@UAE@I@Z @ 139 NONAME ; RadioHistoryModel::~RadioHistoryModel(unsigned int)
- ??1RadioCarouselModel@@UAE@XZ @ 140 NONAME ; RadioCarouselModel::~RadioCarouselModel(void)
- ?addScannedFrequency@RadioScannerEngine@@QAEXI@Z @ 141 NONAME ; void RadioScannerEngine::addScannedFrequency(unsigned int)
- ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 142 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *)
- ?frequencyStepSize@RadioUiEngine@@QBEIXZ @ 143 NONAME ; unsigned int RadioUiEngine::frequencyStepSize(void) const
- ??0RadioHistoryModel@@AAE@AAVRadioUiEngine@@@Z @ 144 NONAME ; RadioHistoryModel::RadioHistoryModel(class RadioUiEngine &)
- ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 145 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *, int)
- ?metaObject@RadioHistoryModel@@UBEPBUQMetaObject@@XZ @ 146 NONAME ; struct QMetaObject const * RadioHistoryModel::metaObject(void) const
- ?setFavorites@RadioStationModel@@QAEXABV?$QList@VQModelIndex@@@@@Z @ 147 NONAME ; void RadioStationModel::setFavorites(class QList<class QModelIndex> const &)
- ?setArtist@RadioHistoryItem@@QAEXABVQString@@@Z @ 148 NONAME ; void RadioHistoryItem::setArtist(class QString const &)
- ?setTitle@RadioHistoryItem@@QAEXABVQString@@@Z @ 149 NONAME ; void RadioHistoryItem::setTitle(class QString const &)
- ?isOfflineProfile@RadioUiEngine@@SA_NXZ @ 150 NONAME ; bool RadioUiEngine::isOfflineProfile(void)
- ?tr@RadioUiEngine@@SA?AVQString@@PBD0@Z @ 151 NONAME ; class QString RadioUiEngine::tr(char const *, char const *)
- ?currentStation@RadioStationModel@@QBEABVRadioStation@@XZ @ 152 NONAME ; class RadioStation const & RadioStationModel::currentStation(void) const
- ?rowCount@RadioHistoryModel@@UBEHABVQModelIndex@@@Z @ 153 NONAME ; int RadioHistoryModel::rowCount(class QModelIndex const &) const
- ?region@RadioUiEngine@@QBE?AW4Region@RadioRegion@@XZ @ 154 NONAME ; enum RadioRegion::Region RadioUiEngine::region(void) const
- ?skipStation@RadioUiEngine@@QAEIW4Mode@StationSkip@@I@Z @ 155 NONAME ; unsigned int RadioUiEngine::skipStation(enum StationSkip::Mode, unsigned int)
- ?isInitialized@RadioUiEngine@@QBE_NXZ @ 156 NONAME ; bool RadioUiEngine::isInitialized(void) const
- ?findFrequency@RadioStationModel@@QAE_NIAAVRadioStation@@@Z @ 157 NONAME ; bool RadioStationModel::findFrequency(unsigned int, class RadioStation &)
- ?stationsInRange@RadioStationModel@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 158 NONAME ; class QList<class RadioStation> RadioStationModel::stationsInRange(unsigned int, unsigned int)
- ?tuneWithDelay@RadioUiEngine@@QAEXIH@Z @ 159 NONAME ; void RadioUiEngine::tuneWithDelay(unsigned int, int)
- ?emitAntennaStatusChanged@RadioUiEngine@@AAEX_N@Z @ 160 NONAME ; void RadioUiEngine::emitAntennaStatusChanged(bool)
- ?settings@RadioUiEngine@@QAEAAVRadioSettingsIf@@XZ @ 161 NONAME ; class RadioSettingsIf & RadioUiEngine::settings(void)
- ??_ERadioScannerEngine@@UAE@I@Z @ 162 NONAME ; RadioScannerEngine::~RadioScannerEngine(unsigned int)
- ?hasPiCode@RadioStation@@QBE_NXZ @ 163 NONAME ; bool RadioStation::hasPiCode(void) const
- ?rdsAvailabilityChanged@RadioUiEngine@@IAEX_N@Z @ 164 NONAME ; void RadioUiEngine::rdsAvailabilityChanged(bool)
- ?qt_metacall@RadioCarouselModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 165 NONAME ; int RadioCarouselModel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?findPresetIndex@RadioStationModel@@QAEHHAAVRadioStation@@@Z @ 166 NONAME ; int RadioStationModel::findPresetIndex(int, class RadioStation &)
- ?stationHandlerIf@RadioStationModel@@QAEAAVRadioStationHandlerIf@@XZ @ 167 NONAME ; class RadioStationHandlerIf & RadioStationModel::stationHandlerIf(void)
- ?emitSeekingStarted@RadioUiEngine@@AAEXW4Direction@Seeking@@@Z @ 168 NONAME ; void RadioUiEngine::emitSeekingStarted(enum Seeking::Direction)
- ??1RadioStationFilterModel@@UAE@XZ @ 169 NONAME ; RadioStationFilterModel::~RadioStationFilterModel(void)
- ?emitAudioRouteChanged@RadioUiEngine@@AAEX_N@Z @ 170 NONAME ; void RadioUiEngine::emitAudioRouteChanged(bool)
- ?d_func@RadioScannerEngine@@ABEPBVRadioScannerEnginePrivate@@XZ @ 171 NONAME ; class RadioScannerEnginePrivate const * RadioScannerEngine::d_func(void) const
- ?toggleAudioRoute@RadioUiEngine@@QAEXXZ @ 172 NONAME ; void RadioUiEngine::toggleAudioRoute(void)
- ?unsetType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 173 NONAME ; void RadioStation::unsetType(class QFlags<enum RadioStation::TypeFlag>)
- ?setIcons@RadioStationModel@@QAEXABVQIcon@@0@Z @ 174 NONAME ; void RadioStationModel::setIcons(class QIcon const &, class QIcon const &)
- ?findUnusedPresetIndex@RadioStationModel@@AAEHXZ @ 175 NONAME ; int RadioStationModel::findUnusedPresetIndex(void)
- ?getStaticMetaObject@RadioHistoryModel@@SAABUQMetaObject@@XZ @ 176 NONAME ; struct QMetaObject const & RadioHistoryModel::getStaticMetaObject(void)
- ?dynamicPsCheckEnded@RadioStationModel@@AAEXXZ @ 177 NONAME ; void RadioStationModel::dynamicPsCheckEnded(void)
- ?seekStation@RadioUiEngine@@QAEXH@Z @ 178 NONAME ; void RadioUiEngine::seekStation(int)
- ?setPiCode@RadioStation@@QAE_NHW4Region@RadioRegion@@@Z @ 179 NONAME ; bool RadioStation::setPiCode(int, enum RadioRegion::Region)
- ?lastTunedFrequency@RadioUiEngine@@SAIXZ @ 180 NONAME ; unsigned int RadioUiEngine::lastTunedFrequency(void)
- ?tunedToFrequency@RadioUiEngine@@IAEXIH@Z @ 181 NONAME ; void RadioUiEngine::tunedToFrequency(unsigned int, int)
- ?tr@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 182 NONAME ; class QString RadioUiEngine::tr(char const *, char const *, int)
- ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 183 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *, int)
- ?data@RadioStationFilterModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 184 NONAME ; class QVariant RadioStationFilterModel::data(class QModelIndex const &, int) const
- ?detach@RadioStation@@QAEXXZ @ 185 NONAME ; void RadioStation::detach(void)
- ?d_func@RadioCarouselModel@@ABEPBVRadioCarouselModelPrivate@@XZ @ 186 NONAME ; class RadioCarouselModelPrivate const * RadioCarouselModel::d_func(void) const
- ?staticMetaObject@RadioScannerEngine@@2UQMetaObject@@B @ 187 NONAME ; struct QMetaObject const RadioScannerEngine::staticMetaObject
- ?radioText@RadioStation@@QBE?AVQString@@XZ @ 188 NONAME ; class QString RadioStation::radioText(void) const
- ?setData@RadioStationModel@@UAE_NABVQModelIndex@@ABVQVariant@@H@Z @ 189 NONAME ; bool RadioStationModel::setData(class QModelIndex const &, class QVariant const &, int)
- ?setPsType@RadioStation@@QAEXV?$QFlags@W4PsTypeFlag@RadioStation@@@@@Z @ 190 NONAME ; void RadioStation::setPsType(class QFlags<enum RadioStation::PsTypeFlag>)
- ?itemAtIndex@RadioHistoryModel@@QBE?AVRadioHistoryItem@@ABVQModelIndex@@@Z @ 191 NONAME ; class RadioHistoryItem RadioHistoryModel::itemAtIndex(class QModelIndex const &) const
- ?emitChangeSignals@RadioStationModel@@AAEXABVRadioStation@@V?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 192 NONAME ; void RadioStationModel::emitChangeSignals(class RadioStation const &, class QFlags<enum RadioStation::ChangeFlag>)
- ?setPresetIndex@RadioStation@@QAEXH@Z @ 193 NONAME ; void RadioStation::setPresetIndex(int)
- ?tr@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 194 NONAME ; class QString RadioStationModel::tr(char const *, char const *, int)
- ?trUtf8@RadioCarouselModel@@SA?AVQString@@PBD0@Z @ 195 NONAME ; class QString RadioCarouselModel::trUtf8(char const *, char const *)
- ?renameStation@RadioStationModel@@QAEXHABVQString@@@Z @ 196 NONAME ; void RadioStationModel::renameStation(int, class QString const &)
- ?currentFrequency@RadioUiEngine@@QBEIXZ @ 197 NONAME ; unsigned int RadioUiEngine::currentFrequency(void) const
- ?emitItemAdded@RadioHistoryModel@@AAEXXZ @ 198 NONAME ; void RadioHistoryModel::emitItemAdded(void)
- ?setUserDefinedName@RadioStation@@QAEXABVQString@@@Z @ 199 NONAME ; void RadioStation::setUserDefinedName(class QString const &)
- ??1RadioStation@@UAE@XZ @ 200 NONAME ; RadioStation::~RadioStation(void)
- ?callSignString@RadioStation@@AAE?AVQString@@I@Z @ 201 NONAME ; class QString RadioStation::callSignString(unsigned int)
- ?getStaticMetaObject@RadioScannerEngine@@SAABUQMetaObject@@XZ @ 202 NONAME ; struct QMetaObject const & RadioScannerEngine::getStaticMetaObject(void)
- ?removeFrequency@RadioCarouselModel@@AAEXABVQModelIndex@@HH@Z @ 203 NONAME ; void RadioCarouselModel::removeFrequency(class QModelIndex const &, int, int)
- ?modelIndexFromFrequency@RadioStationFilterModel@@QAE?AVQModelIndex@@I@Z @ 204 NONAME ; class QModelIndex RadioStationFilterModel::modelIndexFromFrequency(unsigned int)
- ?stationDataChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 205 NONAME ; void RadioStationModel::stationDataChanged(class RadioStation const &)
- ?currentStation@RadioStationModel@@QAEAAVRadioStation@@XZ @ 206 NONAME ; class RadioStation & RadioStationModel::currentStation(void)
- ?genre@RadioStation@@QBEHXZ @ 207 NONAME ; int RadioStation::genre(void) const
- ?isDetached@RadioHistoryItem@@QBE_NXZ @ 208 NONAME ; bool RadioHistoryItem::isDetached(void) const
- ?reset@RadioStation@@QAEXXZ @ 209 NONAME ; void RadioStation::reset(void)
- ??0RadioStation@@QAE@XZ @ 210 NONAME ; RadioStation::RadioStation(void)
- ??1RadioHistoryModel@@UAE@XZ @ 211 NONAME ; RadioHistoryModel::~RadioHistoryModel(void)
- ?data@RadioCarouselModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 212 NONAME ; class QVariant RadioCarouselModel::data(class QModelIndex const &, int) const
- ?isSongRecognitionAppAvailable@RadioUiEngine@@QAE_NXZ @ 213 NONAME ; bool RadioUiEngine::isSongRecognitionAppAvailable(void)
- ?isValid@RadioHistoryItem@@QBE_NXZ @ 214 NONAME ; bool RadioHistoryItem::isValid(void) const
- ?setUrl@RadioStation@@QAEXABVQString@@@Z @ 215 NONAME ; void RadioStation::setUrl(class QString const &)
- ?realIndex@RadioStationFilterModel@@QBE?AVQModelIndex@@ABV2@@Z @ 216 NONAME ; class QModelIndex RadioStationFilterModel::realIndex(class QModelIndex const &) const
- ?data@RadioHistoryModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 217 NONAME ; class QVariant RadioHistoryModel::data(class QModelIndex const &, int) const
- ?modelIndexFromFrequency@RadioCarouselModel@@QAE?AVQModelIndex@@I@Z @ 218 NONAME ; class QModelIndex RadioCarouselModel::modelIndexFromFrequency(unsigned int)
- ?isAntennaAttached@RadioUiEngine@@QBE_NXZ @ 219 NONAME ; bool RadioUiEngine::isAntennaAttached(void) const
- ?emitRdsAvailabilityChanged@RadioUiEngine@@AAEX_N@Z @ 220 NONAME ; void RadioUiEngine::emitRdsAvailabilityChanged(bool)
- ??0RadioStationFilterModel@@QAE@AAVRadioUiEngine@@PAVQObject@@@Z @ 221 NONAME ; RadioStationFilterModel::RadioStationFilterModel(class RadioUiEngine &, class QObject *)
- ?presetIndex@RadioStation@@QBEHXZ @ 222 NONAME ; int RadioStation::presetIndex(void) const
- ?staticMetaObject@RadioStationModel@@2UQMetaObject@@B @ 223 NONAME ; struct QMetaObject const RadioStationModel::staticMetaObject
- ?currentSongReset@RadioHistoryModel@@IAEXXZ @ 224 NONAME ; void RadioHistoryModel::currentSongReset(void)
- ?setFrequency@RadioStation@@QAEXI@Z @ 225 NONAME ; void RadioStation::setFrequency(unsigned int)
- ?isRenamed@RadioStation@@QBE_NXZ @ 226 NONAME ; bool RadioStation::isRenamed(void) const
- ?metaObject@RadioUiEngine@@UBEPBUQMetaObject@@XZ @ 227 NONAME ; struct QMetaObject const * RadioUiEngine::metaObject(void) const
- ?removeStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 228 NONAME ; void RadioStationModel::removeStation(class RadioStation const &)
- ?isUsingLoudspeaker@RadioUiEngine@@QBE_NXZ @ 229 NONAME ; bool RadioUiEngine::isUsingLoudspeaker(void) const
- ?removeByFrequency@RadioStationModel@@QAEXI@Z @ 230 NONAME ; void RadioStationModel::removeByFrequency(unsigned int)
- ??0RadioHistoryItem@@QAE@ABV0@@Z @ 231 NONAME ; RadioHistoryItem::RadioHistoryItem(class RadioHistoryItem const &)
- ?audioRouteChanged@RadioUiEngine@@IAEX_N@Z @ 232 NONAME ; void RadioUiEngine::audioRouteChanged(bool)
- ?findClosest@RadioCarouselModel@@QAE?AVRadioStation@@IW4Mode@StationSkip@@@Z @ 233 NONAME ; class RadioStation RadioCarouselModel::findClosest(unsigned int, enum StationSkip::Mode)
- ?tr@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 234 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *, int)
- ?emitRadioStatusChanged@RadioUiEngine@@AAEX_N@Z @ 235 NONAME ; void RadioUiEngine::emitRadioStatusChanged(bool)
- ??0RadioScannerEngine@@QAE@AAVRadioUiEnginePrivate@@@Z @ 236 NONAME ; RadioScannerEngine::RadioScannerEngine(class RadioUiEnginePrivate &)
- ??_ERadioUiEngine@@UAE@I@Z @ 237 NONAME ; RadioUiEngine::~RadioUiEngine(unsigned int)
- ?setDynamicPsText@RadioStation@@QAEXABVQString@@@Z @ 238 NONAME ; void RadioStation::setDynamicPsText(class QString const &)
- ?addRadioTextPlus@RadioHistoryModel@@AAEXHABVQString@@ABVRadioStation@@@Z @ 239 NONAME ; void RadioHistoryModel::addRadioTextPlus(int, class QString const &, class RadioStation const &)
- ?d_func@RadioStationModel@@AAEPAVRadioStationModelPrivate@@XZ @ 240 NONAME ; class RadioStationModelPrivate * RadioStationModel::d_func(void)
- ?setDetail@RadioStationModel@@QAEXV?$QFlags@W4DetailFlag@RadioStationModel@@@@@Z @ 241 NONAME ; void RadioStationModel::setDetail(class QFlags<enum RadioStationModel::DetailFlag>)
- ?removeAll@RadioHistoryModel@@QAEXXZ @ 242 NONAME ; void RadioHistoryModel::removeAll(void)
- ?rowCount@RadioStationFilterModel@@UBEHABVQModelIndex@@@Z @ 243 NONAME ; int RadioStationFilterModel::rowCount(class QModelIndex const &) const
- ?artist@RadioHistoryItem@@QBE?AVQString@@XZ @ 244 NONAME ; class QString RadioHistoryItem::artist(void) const
- ?reportChangedData@RadioHistoryModel@@AAEXHH@Z @ 245 NONAME ; void RadioHistoryModel::reportChangedData(int, int)
- ?time@RadioHistoryItem@@QBE?AVQString@@XZ @ 246 NONAME ; class QString RadioHistoryItem::time(void) const
- ?isType@RadioStation@@QBE_NV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 247 NONAME ; bool RadioStation::isType(class QFlags<enum RadioStation::TypeFlag>) const
- ?carouselModel@RadioUiEngine@@QAEPAVRadioCarouselModel@@XZ @ 248 NONAME ; class RadioCarouselModel * RadioUiEngine::carouselModel(void)
- ?setTypeFilter@RadioStationFilterModel@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 249 NONAME ; void RadioStationFilterModel::setTypeFilter(class QFlags<enum RadioStation::TypeFlag>)
- ?volumeChanged@RadioUiEngine@@IAEXH@Z @ 250 NONAME ; void RadioUiEngine::volumeChanged(int)
- ?title@RadioHistoryItem@@QBE?AVQString@@XZ @ 251 NONAME ; class QString RadioHistoryItem::title(void) const
- ?data_ptr@RadioStation@@QAEAAPAVRadioStationPrivate@@XZ @ 252 NONAME ; class RadioStationPrivate * & RadioStation::data_ptr(void)
- ?qt_metacast@RadioScannerEngine@@UAEPAXPBD@Z @ 253 NONAME ; void * RadioScannerEngine::qt_metacast(char const *)
- ?tr@RadioCarouselModel@@SA?AVQString@@PBD0@Z @ 254 NONAME ; class QString RadioCarouselModel::tr(char const *, char const *)
- ??1RadioHistoryItem@@UAE@XZ @ 255 NONAME ; RadioHistoryItem::~RadioHistoryItem(void)
- ?antennaStatusChanged@RadioUiEngine@@IAEX_N@Z @ 256 NONAME ; void RadioUiEngine::antennaStatusChanged(bool)
- ?qt_metacall@RadioStationModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 257 NONAME ; int RadioStationModel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?setRadioText@RadioStation@@QAEXABVQString@@@Z @ 258 NONAME ; void RadioStation::setRadioText(class QString const &)
- ?hasDataChanged@RadioStation@@QBE_NV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 259 NONAME ; bool RadioStation::hasDataChanged(class QFlags<enum RadioStation::ChangeFlag>) const
- ?name@RadioStation@@QBE?AVQString@@XZ @ 260 NONAME ; class QString RadioStation::name(void) const
- ?data@RadioStationModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 261 NONAME ; class QVariant RadioStationModel::data(class QModelIndex const &, int) const
- ?itemAdded@RadioHistoryModel@@IAEXXZ @ 262 NONAME ; void RadioHistoryModel::itemAdded(void)
- ?getStaticMetaObject@RadioUiEngine@@SAABUQMetaObject@@XZ @ 263 NONAME ; struct QMetaObject const & RadioUiEngine::getStaticMetaObject(void)
- ?launchSongRecognition@RadioUiEngine@@QAEXXZ @ 264 NONAME ; void RadioUiEngine::launchSongRecognition(void)
- ?iterateCallSign@RadioStation@@AAE?AVQString@@HH@Z @ 265 NONAME ; class QString RadioStation::iterateCallSign(int, int)
- ??0RadioUiEngine@@QAE@PAVQObject@@@Z @ 266 NONAME ; RadioUiEngine::RadioUiEngine(class QObject *)
- ?setCurrentTime@RadioHistoryItem@@QAEXXZ @ 267 NONAME ; void RadioHistoryItem::setCurrentTime(void)
- ?isTagged@RadioHistoryItem@@QBE_NXZ @ 268 NONAME ; bool RadioHistoryItem::isTagged(void) const
- ?minFrequency@RadioUiEngine@@QBEIXZ @ 269 NONAME ; unsigned int RadioUiEngine::minFrequency(void) const
- ?setShowTagged@RadioHistoryModel@@QAEX_N@Z @ 270 NONAME ; void RadioHistoryModel::setShowTagged(bool)
- ?isFavorite@RadioStation@@QBE_NXZ @ 271 NONAME ; bool RadioStation::isFavorite(void) const
- ?radioTextReceived@RadioStationModel@@IAEXABVRadioStation@@@Z @ 272 NONAME ; void RadioStationModel::radioTextReceived(class RadioStation const &)
- ?staticMetaObject@RadioCarouselModel@@2UQMetaObject@@B @ 273 NONAME ; struct QMetaObject const RadioCarouselModel::staticMetaObject
- ?seekingStarted@RadioUiEngine@@IAEXH@Z @ 274 NONAME ; void RadioUiEngine::seekingStarted(int)
- ?isRecognizedByRds@RadioHistoryItem@@QBE_NXZ @ 275 NONAME ; bool RadioHistoryItem::isRecognizedByRds(void) const
- ??_ERadioStationModel@@UAE@I@Z @ 276 NONAME ; RadioStationModel::~RadioStationModel(unsigned int)
- ?openMusicStore@RadioUiEngine@@QAEXABVRadioHistoryItem@@W4MusicStore@1@@Z @ 277 NONAME ; void RadioUiEngine::openMusicStore(class RadioHistoryItem const &, enum RadioUiEngine::MusicStore)
-
--- a/radioapp/bwins/radiowidgetsu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-EXPORTS
- ?trUtf8@RadioWindow@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *, int)
- ?qt_metacast@RadioHistoryView@@UAEPAXPBD@Z @ 2 NONAME ; void * RadioHistoryView::qt_metacast(char const *)
- ?qt_metacast@RadioFadingLabel@@UAEPAXPBD@Z @ 3 NONAME ; void * RadioFadingLabel::qt_metacast(char const *)
- ?tr@RadioBannerLabel@@SA?AVQString@@PBD0@Z @ 4 NONAME ; class QString RadioBannerLabel::tr(char const *, char const *)
- ?toggleButtons@RadioFrequencyStrip@@AAEXXZ @ 5 NONAME ; void RadioFrequencyStrip::toggleButtons(void)
- ?animateNewStation@RadioStationCarousel@@QAEXABVRadioStation@@@Z @ 6 NONAME ; void RadioStationCarousel::animateNewStation(class RadioStation const &)
- ?getStaticMetaObject@RadioBannerLabel@@SAABUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const & RadioBannerLabel::getStaticMetaObject(void)
- ?frequencyChanged@RadioFrequencyStrip@@IAEXIH@Z @ 8 NONAME ; void RadioFrequencyStrip::frequencyChanged(unsigned int, int)
- ?toggleTagging@RadioHistoryView@@AAEXXZ @ 9 NONAME ; void RadioHistoryView::toggleTagging(void)
- ?tr@RadioMainView@@SA?AVQString@@PBD0H@Z @ 10 NONAME ; class QString RadioMainView::tr(char const *, char const *, int)
- ?rename@RadioStationsView@@AAEXXZ @ 11 NONAME ; void RadioStationsView::rename(void)
- ?gestureEvent@RadioStationCarousel@@EAEXPAVQGestureEvent@@@Z @ 12 NONAME ; void RadioStationCarousel::gestureEvent(class QGestureEvent *)
- ??1RadioBannerLabel@@UAE@XZ @ 13 NONAME ; RadioBannerLabel::~RadioBannerLabel(void)
- ?setFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 14 NONAME ; void RadioStationCarousel::setFavoriteIcon(class HbIcon const &)
- ?update@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 15 NONAME ; void RadioStationCarousel::update(class RadioStation const &)
- ?taggedIcon@RadioHistoryView@@QBE?AVHbIcon@@XZ @ 16 NONAME ; class HbIcon RadioHistoryView::taggedIcon(void) const
- ?seekingStarted@RadioMainView@@AAEXXZ @ 17 NONAME ; void RadioMainView::seekingStarted(void)
- ?addFrequencyPos@RadioFrequencyStrip@@AAEXHIPAVRadioFrequencyItem@@@Z @ 18 NONAME ; void RadioFrequencyStrip::addFrequencyPos(int, unsigned int, class RadioFrequencyItem *)
- ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 19 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *)
- ?setScanningMode@RadioFrequencyStrip@@QAEX_N@Z @ 20 NONAME ; void RadioFrequencyStrip::setScanningMode(bool)
- ?createItemPrimitive@RadioFrequencyStrip@@EAEPAVQGraphicsItem@@PAV2@@Z @ 21 NONAME ; class QGraphicsItem * RadioFrequencyStrip::createItemPrimitive(class QGraphicsItem *)
- ??_ERadioStationsView@@UAE@I@Z @ 22 NONAME ; RadioStationsView::~RadioStationsView(unsigned int)
- ?setTextWithoutFading@RadioFadingLabel@@QAEXABVQString@@@Z @ 23 NONAME ; void RadioFadingLabel::setTextWithoutFading(class QString const &)
- ?updateAntennaStatus@RadioWindow@@AAEX_N@Z @ 24 NONAME ; void RadioWindow::updateAntennaStatus(bool)
- ?resizeEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 25 NONAME ; void RadioFrequencyStrip::resizeEvent(class QGraphicsSceneResizeEvent *)
- ?addOneSong@RadioHistoryView@@AAEXXZ @ 26 NONAME ; void RadioHistoryView::addOneSong(void)
- ?startScanning@RadioStationsView@@AAEXXZ @ 27 NONAME ; void RadioStationsView::startScanning(void)
- ?initButtons@RadioFrequencyStrip@@AAEXXZ @ 28 NONAME ; void RadioFrequencyStrip::initButtons(void)
- ?setOrientation@RadioMainView@@EAEXXZ @ 29 NONAME ; void RadioMainView::setOrientation(void)
- ?qt_metacall@RadioStationCarousel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int RadioStationCarousel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?leftButtonIcon@RadioFrequencyStrip@@QBE?AVHbIcon@@XZ @ 31 NONAME ; class HbIcon RadioFrequencyStrip::leftButtonIcon(void) const
- ?init@RadioStationCarousel@@QAEXAAVRadioUiLoader@@PAVRadioUiEngine@@@Z @ 32 NONAME ; void RadioStationCarousel::init(class RadioUiLoader &, class RadioUiEngine *)
- ?insertFrequency@RadioStationCarousel@@AAEXABVQModelIndex@@HH@Z @ 33 NONAME ; void RadioStationCarousel::insertFrequency(class QModelIndex const &, int, int)
- ?toggleScanning@RadioMainView@@AAEXXZ @ 34 NONAME ; void RadioMainView::toggleScanning(void)
- ?staticMetaObject@RadioMainView@@2UQMetaObject@@B @ 35 NONAME ; struct QMetaObject const RadioMainView::staticMetaObject
- ?tr@RadioBannerLabel@@SA?AVQString@@PBD0H@Z @ 36 NONAME ; class QString RadioBannerLabel::tr(char const *, char const *, int)
- ?getStaticMetaObject@RadioMainView@@SAABUQMetaObject@@XZ @ 37 NONAME ; struct QMetaObject const & RadioMainView::getStaticMetaObject(void)
- ?prepareToRemoveFrequency@RadioStationCarousel@@AAEXABVQModelIndex@@HH@Z @ 38 NONAME ; void RadioStationCarousel::prepareToRemoveFrequency(class QModelIndex const &, int, int)
- ?setAutoScrollTime@RadioStationCarousel@@QAEXH@Z @ 39 NONAME ; void RadioStationCarousel::setAutoScrollTime(int)
- ?setLeftButtonIcon@RadioFrequencyStrip@@QAEXABVHbIcon@@@Z @ 40 NONAME ; void RadioFrequencyStrip::setLeftButtonIcon(class HbIcon const &)
- ?setItemVisible@RadioStationCarousel@@QAEX_N@Z @ 41 NONAME ; void RadioStationCarousel::setItemVisible(bool)
- ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *)
- ?tr@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 43 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *)
- ?skip@RadioStationCarousel@@AAEXW4Mode@StationSkip@@@Z @ 44 NONAME ; void RadioStationCarousel::skip(enum StationSkip::Mode)
- ?selectorPos@RadioFrequencyStrip@@ABEHXZ @ 45 NONAME ; int RadioFrequencyStrip::selectorPos(void) const
- ?currentStationItem@RadioStationCarousel@@AAEPAVRadioStationItem@@XZ @ 46 NONAME ; class RadioStationItem * RadioStationCarousel::currentStationItem(void)
- ??1RadioWindow@@UAE@XZ @ 47 NONAME ; RadioWindow::~RadioWindow(void)
- ?updateFrequencies@RadioStationCarousel@@AAEXXZ @ 48 NONAME ; void RadioStationCarousel::updateFrequencies(void)
- ?metaObject@RadioBannerLabel@@UBEPBUQMetaObject@@XZ @ 49 NONAME ; struct QMetaObject const * RadioBannerLabel::metaObject(void) const
- ?skipRequested@RadioFrequencyStrip@@IAEXH@Z @ 50 NONAME ; void RadioFrequencyStrip::skipRequested(int)
- ?setTaggedIcon@RadioHistoryView@@QAEXABVHbIcon@@@Z @ 51 NONAME ; void RadioHistoryView::setTaggedIcon(class HbIcon const &)
- ?setText@RadioFadingLabel@@QAEXABVQString@@@Z @ 52 NONAME ; void RadioFadingLabel::setText(class QString const &)
- ?setNowPlayingIcon@RadioStationsView@@QAEXABVHbIcon@@@Z @ 53 NONAME ; void RadioStationsView::setNowPlayingIcon(class HbIcon const &)
- ?mousePressEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 54 NONAME ; void RadioStationCarousel::mousePressEvent(class QGraphicsSceneMouseEvent *)
- ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 55 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *)
- ?tr@RadioStationsView@@SA?AVQString@@PBD0@Z @ 56 NONAME ; class QString RadioStationsView::tr(char const *, char const *)
- ?favoriteIcon@RadioStationCarousel@@QBE?AVHbIcon@@XZ @ 57 NONAME ; class HbIcon RadioStationCarousel::favoriteIcon(void) const
- ?qt_metacall@RadioBannerLabel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 58 NONAME ; int RadioBannerLabel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?orientationSection@RadioWindow@@QAE?AVQString@@XZ @ 59 NONAME ; class QString RadioWindow::orientationSection(void)
- ?updateStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 60 NONAME ; void RadioFrequencyStrip::updateStation(class QModelIndex const &, int, int)
- ?setScanningMode@RadioMainView@@QAEX_N@Z @ 61 NONAME ; void RadioMainView::setScanningMode(bool)
- ?favoriteIcon@RadioStationsView@@QBE?AVHbIcon@@XZ @ 62 NONAME ; class HbIcon RadioStationsView::favoriteIcon(void) const
- ?trUtf8@RadioMainView@@SA?AVQString@@PBD0H@Z @ 63 NONAME ; class QString RadioMainView::trUtf8(char const *, char const *, int)
- ??1RadioFrequencyStrip@@UAE@XZ @ 64 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(void)
- ?trUtf8@RadioStationsView@@SA?AVQString@@PBD0H@Z @ 65 NONAME ; class QString RadioStationsView::trUtf8(char const *, char const *, int)
- ?tr@RadioMainView@@SA?AVQString@@PBD0@Z @ 66 NONAME ; class QString RadioMainView::tr(char const *, char const *)
- ?updateFavorites@RadioFrequencyStrip@@AAEXPAVRadioFrequencyItem@@@Z @ 67 NONAME ; void RadioFrequencyStrip::updateFavorites(class RadioFrequencyItem *)
- ?showContextMenu@RadioHistoryView@@AAEXABVQModelIndex@@@Z @ 68 NONAME ; void RadioHistoryView::showContextMenu(class QModelIndex const &)
- ?changeEvent@RadioFrequencyStrip@@EAEXPAVQEvent@@@Z @ 69 NONAME ; void RadioFrequencyStrip::changeEvent(class QEvent *)
- ?updatePos@RadioStationCarousel@@AAEXH@Z @ 70 NONAME ; void RadioStationCarousel::updatePos(int)
- ?staticMetaObject@RadioStationCarousel@@2UQMetaObject@@B @ 71 NONAME ; struct QMetaObject const RadioStationCarousel::staticMetaObject
- ?qt_metacall@RadioFadingLabel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 72 NONAME ; int RadioFadingLabel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?finishScanning@RadioStationsView@@AAEXXZ @ 73 NONAME ; void RadioStationsView::finishScanning(void)
- ??0RadioFrequencyStrip@@QAE@XZ @ 74 NONAME ; RadioFrequencyStrip::RadioFrequencyStrip(void)
- ?trUtf8@RadioBannerLabel@@SA?AVQString@@PBD0H@Z @ 75 NONAME ; class QString RadioBannerLabel::trUtf8(char const *, char const *, int)
- ?skip@RadioMainView@@AAEXH@Z @ 76 NONAME ; void RadioMainView::skip(int)
- ??0RadioMainView@@QAE@XZ @ 77 NONAME ; RadioMainView::RadioMainView(void)
- ?setRightButtonIcon@RadioFrequencyStrip@@QAEXABVHbIcon@@@Z @ 78 NONAME ; void RadioFrequencyStrip::setRightButtonIcon(class HbIcon const &)
- ?openContextMenu@RadioStationCarousel@@AAEXPAVHbAbstractViewItem@@ABVQPointF@@@Z @ 79 NONAME ; void RadioStationCarousel::openContextMenu(class HbAbstractViewItem *, class QPointF const &)
- ?staticMetaObject@RadioStationsView@@2UQMetaObject@@B @ 80 NONAME ; struct QMetaObject const RadioStationsView::staticMetaObject
- ??_ERadioBannerLabel@@UAE@I@Z @ 81 NONAME ; RadioBannerLabel::~RadioBannerLabel(unsigned int)
- ??_ERadioMainView@@UAE@I@Z @ 82 NONAME ; RadioMainView::~RadioMainView(unsigned int)
- ??_ERadioWindow@@UAE@I@Z @ 83 NONAME ; RadioWindow::~RadioWindow(unsigned int)
- ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 84 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *)
- ?qt_metacast@RadioStationsView@@UAEPAXPBD@Z @ 85 NONAME ; void * RadioStationsView::qt_metacast(char const *)
- ?initSelector@RadioFrequencyStrip@@AAEXXZ @ 86 NONAME ; void RadioFrequencyStrip::initSelector(void)
- ?addSongs@RadioHistoryView@@AAEXXZ @ 87 NONAME ; void RadioHistoryView::addSongs(void)
- ?qt_metacall@RadioWindow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 88 NONAME ; int RadioWindow::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacall@RadioFrequencyStrip@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 89 NONAME ; int RadioFrequencyStrip::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?openOtherStore@RadioHistoryView@@AAEXXZ @ 90 NONAME ; void RadioHistoryView::openOtherStore(void)
- ?metaObject@RadioFrequencyStrip@@UBEPBUQMetaObject@@XZ @ 91 NONAME ; struct QMetaObject const * RadioFrequencyStrip::metaObject(void) const
- ?startEffect@RadioFadingLabel@@AAEXABVQString@@PBD@Z @ 92 NONAME ; void RadioFadingLabel::startEffect(class QString const &, char const *)
- ?trUtf8@RadioStationsView@@SA?AVQString@@PBD0@Z @ 93 NONAME ; class QString RadioStationsView::trUtf8(char const *, char const *)
- ?qt_metacast@RadioBannerLabel@@UAEPAXPBD@Z @ 94 NONAME ; void * RadioBannerLabel::qt_metacast(char const *)
- ?qt_metacall@RadioStationsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 95 NONAME ; int RadioStationsView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?historyModel@RadioHistoryView@@ABEAAVRadioHistoryModel@@XZ @ 96 NONAME ; class RadioHistoryModel & RadioHistoryView::historyModel(void) const
- ?activateHistoryView@RadioWindow@@QAEXXZ @ 97 NONAME ; void RadioWindow::activateHistoryView(void)
- ??_ERadioStationCarousel@@UAE@I@Z @ 98 NONAME ; RadioStationCarousel::~RadioStationCarousel(unsigned int)
- ?initPositions@RadioFrequencyStrip@@AAEXXZ @ 99 NONAME ; void RadioFrequencyStrip::initPositions(void)
- ?carouselModel@RadioStationCarousel@@ABEPAVRadioCarouselModel@@XZ @ 100 NONAME ; class RadioCarouselModel * RadioStationCarousel::carouselModel(void) const
- ?tr@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *)
- ?getStaticMetaObject@RadioFadingLabel@@SAABUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const & RadioFadingLabel::getStaticMetaObject(void)
- ?trUtf8@RadioHistoryView@@SA?AVQString@@PBD0@Z @ 103 NONAME ; class QString RadioHistoryView::trUtf8(char const *, char const *)
- ?metaObject@RadioMainView@@UBEPBUQMetaObject@@XZ @ 104 NONAME ; struct QMetaObject const * RadioMainView::metaObject(void) const
- ?clearList@RadioHistoryView@@AAEXXZ @ 105 NONAME ; void RadioHistoryView::clearList(void)
- ?qt_metacast@RadioWindow@@UAEPAXPBD@Z @ 106 NONAME ; void * RadioWindow::qt_metacast(char const *)
- ?trimHtml@RadioFadingLabel@@AAE?AVQString@@ABV2@@Z @ 107 NONAME ; class QString RadioFadingLabel::trimHtml(class QString const &)
- ?tr@RadioWindow@@SA?AVQString@@PBD0@Z @ 108 NONAME ; class QString RadioWindow::tr(char const *, char const *)
- ?nonTaggedIcon@RadioHistoryView@@QBE?AVHbIcon@@XZ @ 109 NONAME ; class HbIcon RadioHistoryView::nonTaggedIcon(void) const
- ?mouseReleaseEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 110 NONAME ; void RadioFrequencyStrip::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
- ?updateItemPrimitive@RadioFrequencyStrip@@EAEXPAVQGraphicsItem@@H@Z @ 111 NONAME ; void RadioFrequencyStrip::updateItemPrimitive(class QGraphicsItem *, int)
- ?showErrorMessage@RadioWindow@@QAEXABVQString@@@Z @ 112 NONAME ; void RadioWindow::showErrorMessage(class QString const &)
- ?getStaticMetaObject@RadioFrequencyStrip@@SAABUQMetaObject@@XZ @ 113 NONAME ; struct QMetaObject const & RadioFrequencyStrip::getStaticMetaObject(void)
- ?removeFrequency@RadioStationCarousel@@AAEXABVQModelIndex@@HH@Z @ 114 NONAME ; void RadioStationCarousel::removeFrequency(class QModelIndex const &, int, int)
- ??0RadioFadingLabel@@QAE@PAVQGraphicsItem@@@Z @ 115 NONAME ; RadioFadingLabel::RadioFadingLabel(class QGraphicsItem *)
- ?activateView@RadioWindow@@AAEXAAV?$QPointer@VRadioViewBase@@@@ABVQString@@V?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 116 NONAME ; void RadioWindow::activateView(class QPointer<class RadioViewBase> &, class QString const &, class QFlags<enum Hb::ViewSwitchFlag>)
- ?initListView@RadioStationsView@@AAEXXZ @ 117 NONAME ; void RadioStationsView::initListView(void)
- ?initModel@RadioFrequencyStrip@@AAEXXZ @ 118 NONAME ; void RadioFrequencyStrip::initModel(void)
- ?scrollToIndex@RadioStationCarousel@@AAEXABVQModelIndex@@V?$QFlags@W4ScrollFlag@RadioStationCarousel@@@@@Z @ 119 NONAME ; void RadioStationCarousel::scrollToIndex(class QModelIndex const &, class QFlags<enum RadioStationCarousel::ScrollFlag>)
- ??0RadioStationsView@@QAE@XZ @ 120 NONAME ; RadioStationsView::RadioStationsView(void)
- ?frequency@RadioFrequencyStrip@@QBEIXZ @ 121 NONAME ; unsigned int RadioFrequencyStrip::frequency(void) const
- ?updateItems@RadioFrequencyStrip@@AAEXXZ @ 122 NONAME ; void RadioFrequencyStrip::updateItems(void)
- ??0RadioBannerLabel@@QAE@PAVQGraphicsItem@@@Z @ 123 NONAME ; RadioBannerLabel::RadioBannerLabel(class QGraphicsItem *)
- ??1RadioStationCarousel@@UAE@XZ @ 124 NONAME ; RadioStationCarousel::~RadioStationCarousel(void)
- ?deckButtonPressed@RadioHistoryView@@AAEXXZ @ 125 NONAME ; void RadioHistoryView::deckButtonPressed(void)
- ?setNonTaggedIcon@RadioHistoryView@@QAEXABVHbIcon@@@Z @ 126 NONAME ; void RadioHistoryView::setNonTaggedIcon(class HbIcon const &)
- ??_ERadioFrequencyStrip@@UAE@I@Z @ 127 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(unsigned int)
- ?uiEngine@RadioWindow@@QAEAAVRadioUiEngine@@XZ @ 128 NONAME ; class RadioUiEngine & RadioWindow::uiEngine(void)
- ?trUtf8@RadioMainView@@SA?AVQString@@PBD0@Z @ 129 NONAME ; class QString RadioMainView::trUtf8(char const *, char const *)
- ?setCarouselModel@RadioStationCarousel@@QAEXPAVRadioCarouselModel@@@Z @ 130 NONAME ; void RadioStationCarousel::setCarouselModel(class RadioCarouselModel *)
- ?setFadingEnabled@RadioFadingLabel@@QAEX_N@Z @ 131 NONAME ; void RadioFadingLabel::setFadingEnabled(bool)
- ?showVolumeLevel@RadioWindow@@AAEXH@Z @ 132 NONAME ; void RadioWindow::showVolumeLevel(int)
- ?frequencyChanged@RadioStationCarousel@@IAEXIH@Z @ 133 NONAME ; void RadioStationCarousel::frequencyChanged(unsigned int, int)
- ?mousePressEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 134 NONAME ; void RadioFrequencyStrip::mousePressEvent(class QGraphicsSceneMouseEvent *)
- ?getStaticMetaObject@RadioWindow@@SAABUQMetaObject@@XZ @ 135 NONAME ; struct QMetaObject const & RadioWindow::getStaticMetaObject(void)
- ?trUtf8@RadioWindow@@SA?AVQString@@PBD0@Z @ 136 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *)
- ?timerFired@RadioStationCarousel@@AAEXXZ @ 137 NONAME ; void RadioStationCarousel::timerFired(void)
- ?drawPixmap@RadioFrequencyStrip@@AAE?AVQPixmap@@IV?$QList@VRadioStation@@@@PAVRadioFrequencyItem@@@Z @ 138 NONAME ; class QPixmap RadioFrequencyStrip::drawPixmap(unsigned int, class QList<class RadioStation>, class RadioFrequencyItem *)
- ?getStaticMetaObject@RadioStationsView@@SAABUQMetaObject@@XZ @ 139 NONAME ; struct QMetaObject const & RadioStationsView::getStaticMetaObject(void)
- ?initEmptyItems@RadioFrequencyStrip@@AAEXXZ @ 140 NONAME ; void RadioFrequencyStrip::initEmptyItems(void)
- ?listItemClicked@RadioStationsView@@AAEXABVQModelIndex@@@Z @ 141 NONAME ; void RadioStationsView::listItemClicked(class QModelIndex const &)
- ?updateCurrentItem@RadioStationCarousel@@QAEXXZ @ 142 NONAME ; void RadioStationCarousel::updateCurrentItem(void)
- ?updateAntennaStatus@RadioStationsView@@AAEX_N@Z @ 143 NONAME ; void RadioStationsView::updateAntennaStatus(bool)
- ?tr@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 144 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *, int)
- ??0RadioWindow@@QAE@PAVQWidget@@@Z @ 145 NONAME ; RadioWindow::RadioWindow(class QWidget *)
- ?updateRadioText@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 146 NONAME ; void RadioStationCarousel::updateRadioText(class RadioStation const &)
- ?updateAntennaStatus@RadioStationCarousel@@QAEX_N@Z @ 147 NONAME ; void RadioStationCarousel::updateAntennaStatus(bool)
- ?paint@RadioBannerLabel@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 148 NONAME ; void RadioBannerLabel::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
- ?updateFavorite@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 149 NONAME ; void RadioFrequencyStrip::updateFavorite(class RadioStation const &)
- ?setInfoText@RadioStationCarousel@@QAEXW4Type@CarouselInfoText@@@Z @ 150 NONAME ; void RadioStationCarousel::setInfoText(enum CarouselInfoText::Type)
- ?initToLastTunedFrequency@RadioStationCarousel@@AAEXXZ @ 151 NONAME ; void RadioStationCarousel::initToLastTunedFrequency(void)
- ?staticMetaObject@RadioFadingLabel@@2UQMetaObject@@B @ 152 NONAME ; struct QMetaObject const RadioFadingLabel::staticMetaObject
- ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 153 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *, int)
- ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 154 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *, int)
- ?trUtf8@RadioBannerLabel@@SA?AVQString@@PBD0@Z @ 155 NONAME ; class QString RadioBannerLabel::trUtf8(char const *, char const *)
- ?setFrequencyFromWidget@RadioMainView@@AAEXIH@Z @ 156 NONAME ; void RadioMainView::setFrequencyFromWidget(unsigned int, int)
- ?getStaticMetaObject@RadioStationCarousel@@SAABUQMetaObject@@XZ @ 157 NONAME ; struct QMetaObject const & RadioStationCarousel::getStaticMetaObject(void)
- ?metaObject@RadioFadingLabel@@UBEPBUQMetaObject@@XZ @ 158 NONAME ; struct QMetaObject const * RadioFadingLabel::metaObject(void) const
- ?metaObject@RadioWindow@@UBEPBUQMetaObject@@XZ @ 159 NONAME ; struct QMetaObject const * RadioWindow::metaObject(void) const
- ?staticMetaObject@RadioFrequencyStrip@@2UQMetaObject@@B @ 160 NONAME ; struct QMetaObject const RadioFrequencyStrip::staticMetaObject
- ?updateClampingStyle@RadioStationCarousel@@AAEXXZ @ 161 NONAME ; void RadioStationCarousel::updateClampingStyle(void)
- ?tr@RadioStationsView@@SA?AVQString@@PBD0H@Z @ 162 NONAME ; class QString RadioStationsView::tr(char const *, char const *, int)
- ?autoScrollTime@RadioStationCarousel@@QBEHXZ @ 163 NONAME ; int RadioStationCarousel::autoScrollTime(void) const
- ?handleRightButton@RadioFrequencyStrip@@AAEXXZ @ 164 NONAME ; void RadioFrequencyStrip::handleRightButton(void)
- ?initCurrentStationItem@RadioStationCarousel@@AAEXXZ @ 165 NONAME ; void RadioStationCarousel::initCurrentStationItem(void)
- ?qt_metacast@RadioStationCarousel@@UAEPAXPBD@Z @ 166 NONAME ; void * RadioStationCarousel::qt_metacast(char const *)
- ?clearList@RadioStationsView@@AAEXXZ @ 167 NONAME ; void RadioStationsView::clearList(void)
- ?openOviStore@RadioHistoryView@@AAEXXZ @ 168 NONAME ; void RadioHistoryView::openOviStore(void)
- ?showEvent@RadioFrequencyStrip@@EAEXPAVQShowEvent@@@Z @ 169 NONAME ; void RadioFrequencyStrip::showEvent(class QShowEvent *)
- ?tr@RadioWindow@@SA?AVQString@@PBD0H@Z @ 170 NONAME ; class QString RadioWindow::tr(char const *, char const *, int)
- ?seekRequested@RadioFrequencyStrip@@IAEXH@Z @ 171 NONAME ; void RadioFrequencyStrip::seekRequested(int)
- ?handleLongRightButton@RadioFrequencyStrip@@AAEXXZ @ 172 NONAME ; void RadioFrequencyStrip::handleLongRightButton(void)
- ?setFrequency@RadioFrequencyStrip@@QAEXIH@Z @ 173 NONAME ; void RadioFrequencyStrip::setFrequency(unsigned int, int)
- ?init@RadioHistoryView@@EAEXXZ @ 174 NONAME ; void RadioHistoryView::init(void)
- ?setFrequencyFromEngine@RadioMainView@@AAEXIH@Z @ 175 NONAME ; void RadioMainView::setFrequencyFromEngine(unsigned int, int)
- ?tr@RadioHistoryView@@SA?AVQString@@PBD0H@Z @ 176 NONAME ; class QString RadioHistoryView::tr(char const *, char const *, int)
- ?setFavoriteIcon@RadioStationsView@@QAEXABVHbIcon@@@Z @ 177 NONAME ; void RadioStationsView::setFavoriteIcon(class HbIcon const &)
- ??0RadioHistoryView@@QAE@XZ @ 178 NONAME ; RadioHistoryView::RadioHistoryView(void)
- ?metaObject@RadioStationCarousel@@UBEPBUQMetaObject@@XZ @ 179 NONAME ; struct QMetaObject const * RadioStationCarousel::metaObject(void) const
- ?effectFinished@RadioFadingLabel@@AAEXUEffectStatus@HbEffect@@@Z @ 180 NONAME ; void RadioFadingLabel::effectFinished(struct HbEffect::EffectStatus)
- ?updateOrientation@RadioWindow@@AAEXW4Orientation@Qt@@@Z @ 181 NONAME ; void RadioWindow::updateOrientation(enum Qt::Orientation)
- ?updateCurrentStation@RadioStationsView@@AAEXXZ @ 182 NONAME ; void RadioStationsView::updateCurrentStation(void)
- ?setOrientation@RadioHistoryView@@EAEXXZ @ 183 NONAME ; void RadioHistoryView::setOrientation(void)
- ?showButtons@RadioFrequencyStrip@@AAEXXZ @ 184 NONAME ; void RadioFrequencyStrip::showButtons(void)
- ?nonFavoriteIcon@RadioStationCarousel@@QBE?AVHbIcon@@XZ @ 185 NONAME ; class HbIcon RadioStationCarousel::nonFavoriteIcon(void) const
- ?scrollToFrequency@RadioFrequencyStrip@@AAEXIH@Z @ 186 NONAME ; void RadioFrequencyStrip::scrollToFrequency(unsigned int, int)
- ?uiEngine@RadioStationCarousel@@QAEPAVRadioUiEngine@@XZ @ 187 NONAME ; class RadioUiEngine * RadioStationCarousel::uiEngine(void)
- ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 188 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *, int)
- ?scrollPosChanged@RadioFrequencyStrip@@EAEXVQPointF@@@Z @ 189 NONAME ; void RadioFrequencyStrip::scrollPosChanged(class QPointF)
- ?deleteStation@RadioStationsView@@AAEXXZ @ 190 NONAME ; void RadioStationsView::deleteStation(void)
- ?activateMainView@RadioWindow@@QAEXXZ @ 191 NONAME ; void RadioWindow::activateMainView(void)
- ?rightButtonIcon@RadioFrequencyStrip@@QBE?AVHbIcon@@XZ @ 192 NONAME ; class HbIcon RadioFrequencyStrip::rightButtonIcon(void) const
- ?setScanningMode@RadioStationCarousel@@QAEX_N@Z @ 193 NONAME ; void RadioStationCarousel::setScanningMode(bool)
- ?setNonFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 194 NONAME ; void RadioStationCarousel::setNonFavoriteIcon(class HbIcon const &)
- ??1RadioFadingLabel@@UAE@XZ @ 195 NONAME ; RadioFadingLabel::~RadioFadingLabel(void)
- ?isInScanningMode@RadioStationCarousel@@QBE_NXZ @ 196 NONAME ; bool RadioStationCarousel::isInScanningMode(void) const
- ?tr@RadioHistoryView@@SA?AVQString@@PBD0@Z @ 197 NONAME ; class QString RadioHistoryView::tr(char const *, char const *)
- ?staticMetaObject@RadioBannerLabel@@2UQMetaObject@@B @ 198 NONAME ; struct QMetaObject const RadioBannerLabel::staticMetaObject
- ?checkIllegalPos@RadioFrequencyStrip@@AAEXXZ @ 199 NONAME ; void RadioFrequencyStrip::checkIllegalPos(void)
- ?setFrequency@RadioStationCarousel@@QAEXIH@Z @ 200 NONAME ; void RadioStationCarousel::setFrequency(unsigned int, int)
- ?getStaticMetaObject@RadioHistoryView@@SAABUQMetaObject@@XZ @ 201 NONAME ; struct QMetaObject const & RadioHistoryView::getStaticMetaObject(void)
- ?activateStationsView@RadioWindow@@QAEXXZ @ 202 NONAME ; void RadioWindow::activateStationsView(void)
- ?isAntennaAttached@RadioStationCarousel@@QBE_NXZ @ 203 NONAME ; bool RadioStationCarousel::isAntennaAttached(void) const
- ?metaObject@RadioHistoryView@@UBEPBUQMetaObject@@XZ @ 204 NONAME ; struct QMetaObject const * RadioHistoryView::metaObject(void) const
- ?tr@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 205 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *, int)
- ??_ERadioHistoryView@@UAE@I@Z @ 206 NONAME ; RadioHistoryView::~RadioHistoryView(unsigned int)
- ?updateAudioRoute@RadioMainView@@AAEX_N@Z @ 207 NONAME ; void RadioMainView::updateAudioRoute(bool)
- ?gestureEvent@RadioFrequencyStrip@@EAEXPAVQGestureEvent@@@Z @ 208 NONAME ; void RadioFrequencyStrip::gestureEvent(class QGestureEvent *)
- ?initView@RadioWindow@@AAEXXZ @ 209 NONAME ; void RadioWindow::initView(void)
- ?qt_metacall@RadioHistoryView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 210 NONAME ; int RadioHistoryView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 211 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *, int)
- ?nowPlayingIcon@RadioStationsView@@QBE?AVHbIcon@@XZ @ 212 NONAME ; class HbIcon RadioStationsView::nowPlayingIcon(void) const
- ?toggleFavorite@RadioStationsView@@AAEXXZ @ 213 NONAME ; void RadioStationsView::toggleFavorite(void)
- ?qt_metacast@RadioMainView@@UAEPAXPBD@Z @ 214 NONAME ; void * RadioMainView::qt_metacast(char const *)
- ??1RadioStationsView@@UAE@XZ @ 215 NONAME ; RadioStationsView::~RadioStationsView(void)
- ?handleLongLeftButton@RadioFrequencyStrip@@AAEXXZ @ 216 NONAME ; void RadioFrequencyStrip::handleLongLeftButton(void)
- ?init@RadioMainView@@EAEXXZ @ 217 NONAME ; void RadioMainView::init(void)
- ?showEvent@RadioStationsView@@EAEXPAVQShowEvent@@@Z @ 218 NONAME ; void RadioStationsView::showEvent(class QShowEvent *)
- ??1RadioMainView@@UAE@XZ @ 219 NONAME ; RadioMainView::~RadioMainView(void)
- ?hideButtons@RadioFrequencyStrip@@AAEXXZ @ 220 NONAME ; void RadioFrequencyStrip::hideButtons(void)
- ?emitFrequencyChanged@RadioFrequencyStrip@@AAEXI@Z @ 221 NONAME ; void RadioFrequencyStrip::emitFrequencyChanged(unsigned int)
- ?handleLeftButton@RadioFrequencyStrip@@AAEXXZ @ 222 NONAME ; void RadioFrequencyStrip::handleLeftButton(void)
- ??_ERadioFadingLabel@@UAE@I@Z @ 223 NONAME ; RadioFadingLabel::~RadioFadingLabel(unsigned int)
- ?trUtf8@RadioHistoryView@@SA?AVQString@@PBD0H@Z @ 224 NONAME ; class QString RadioHistoryView::trUtf8(char const *, char const *, int)
- ?init@RadioFrequencyStrip@@QAEXPAVRadioUiEngine@@@Z @ 225 NONAME ; void RadioFrequencyStrip::init(class RadioUiEngine *)
- ?init@RadioStationsView@@EAEXXZ @ 226 NONAME ; void RadioStationsView::init(void)
- ?updateVisibilities@RadioHistoryView@@AAEXXZ @ 227 NONAME ; void RadioHistoryView::updateVisibilities(void)
- ?updateControlVisibilities@RadioStationsView@@AAEXXZ @ 228 NONAME ; void RadioStationsView::updateControlVisibilities(void)
- ?init@RadioWindow@@QAEXXZ @ 229 NONAME ; void RadioWindow::init(void)
- ?listItemLongPressed@RadioStationsView@@AAEXPAVHbAbstractViewItem@@ABVQPointF@@@Z @ 230 NONAME ; void RadioStationsView::listItemLongPressed(class HbAbstractViewItem *, class QPointF const &)
- ?qt_metacall@RadioMainView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 231 NONAME ; int RadioMainView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??1RadioHistoryView@@UAE@XZ @ 232 NONAME ; RadioHistoryView::~RadioHistoryView(void)
- ?deckButtonPressed@RadioStationsView@@AAEXXZ @ 233 NONAME ; void RadioStationsView::deckButtonPressed(void)
- ?qt_metacast@RadioFrequencyStrip@@UAEPAXPBD@Z @ 234 NONAME ; void * RadioFrequencyStrip::qt_metacast(char const *)
- ??0RadioStationCarousel@@QAE@PAVRadioUiEngine@@@Z @ 235 NONAME ; RadioStationCarousel::RadioStationCarousel(class RadioUiEngine *)
- ?staticMetaObject@RadioWindow@@2UQMetaObject@@B @ 236 NONAME ; struct QMetaObject const RadioWindow::staticMetaObject
- ?staticMetaObject@RadioHistoryView@@2UQMetaObject@@B @ 237 NONAME ; struct QMetaObject const RadioHistoryView::staticMetaObject
- ?metaObject@RadioStationsView@@UBEPBUQMetaObject@@XZ @ 238 NONAME ; struct QMetaObject const * RadioStationsView::metaObject(void) const
- ?clearInfoText@RadioStationCarousel@@QAEXXZ @ 239 NONAME ; void RadioStationCarousel::clearInfoText(void)
- ?cleanRdsData@RadioStationCarousel@@QAEXXZ @ 240 NONAME ; void RadioStationCarousel::cleanRdsData(void)
- ?scanAnimationFinished@RadioStationCarousel@@IAEXXZ @ 241 NONAME ; void RadioStationCarousel::scanAnimationFinished(void)
- ?userAccepted@RadioMainView@@EAEXXZ @ 242 NONAME ; void RadioMainView::userAccepted(void)
- ?userAccepted@RadioStationsView@@EAEXXZ @ 243 NONAME ; void RadioStationsView::userAccepted(void)
- ?renameDone@RadioStationsView@@AAEXPAVHbAction@@@Z @ 244 NONAME ; void RadioStationsView::renameDone(class HbAction *)
- ?userAccepted@RadioHistoryView@@EAEXXZ @ 245 NONAME ; void RadioHistoryView::userAccepted(void)
-
--- a/radioapp/commoninc/radio_global.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +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>
-
-// Constants
-
-/**
- * Radio frequency multiplier
- */
-const int KFrequencyMultiplier = 1000000;
-
-const int KOneHertz = KFrequencyMultiplier;
-
-/**
- * Desired amount of steps in the volume control in the UI
- */
-const int KMaximumVolumeLevel = 20;
-
-/**
- * Id of the offline profile
- */
-const int KOfflineProfileId = 5;
-
-/**
- * Radio Text Plus tag ids
- */
-namespace RtPlus
-{
- enum Tag { Dummy = 0, Title = 1, Artist = 4, Homepage = 39 };
-}
-
-namespace Seeking
-{
- enum Direction
- {
- Down,
- Up
- };
-
- enum State
- {
- NotSeeking,
- SeekingUp,
- SeekingDown
- };
-}
-
-namespace StationSkip
-{
- enum Mode
- {
- Previous,
- Next,
- PreviousFavorite,
- NextFavorite
- };
-}
-
-namespace TuneReason
-{
- enum Reason
- {
- Unspecified,
- FrequencyStrip,
- StationCarousel,
- StationsList,
- Skip,
- Seek,
- StationScanInitialization,
- StationScan,
- };
-}
-
-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/radioapp/commoninc/radiologger.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +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>
-
-// User includes
-
-#ifdef BUILD_WRAPPER_DLL
- #define WRAPPER_DLL_EXPORT Q_DECL_EXPORT
-#else
- #define WRAPPER_DLL_EXPORT Q_DECL_IMPORT
-#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>
-
-// Log marker that is printed in the beginnig of each line
-#define LOGMARKER "FMRadio:"
-
-// 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 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
-#define DEBUGVAR(a) a
-
-// 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 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
-// ============================================================================
-
-// ============================================================================
-// SIGNAL/SLOT CONNECTION CHECKER
-// ============================================================================
-static bool connectAndTest( 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 CONNECTION FAILED!
- // ----------------------------------------------------------------
- }
-
-# endif
-
- return connected;
-}
-
-#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/radioapp/commoninc/radionotificationdata.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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
-
-class RadioNotificationData
-{
-public:
-
- RadioNotificationData() : mType( 0 ) {}
- RadioNotificationData( int type, const QVariant& data ) :
- mType( type ),
- mData( data )
- {}
-
- virtual ~RadioNotificationData() {}
-
- template <typename Stream> void serialize( Stream& stream ) const;
- template <typename Stream> void deserialize( Stream& stream );
-
- int mType;
- QVariant mData;
-
-};
-
-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)
-
-#endif // RADIONOTIFICATIONDATA_H
--- a/radioapp/commoninc/radioservicedef.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +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
-
-static QString RADIO_CONTROL_SERVICE = "com.nokia.services.Radio.IRadioControl";
-static QString RADIO_MONITOR_SERVICE = "com.nokia.services.Radio.IRadioMonitor";
-
-const long KRadioPSUid = 0x101FF976;
-const unsigned long KRadioStartupKey = 0x00000014;
-
-namespace RadioServiceCommand
-{
- enum CommandId
- {
- Play,
- Pause,
- Previous,
- Next,
- SeekUp,
- SeekDown,
- Foreground,
- Background
- };
-}
-
-namespace RadioServiceNotification
-{
- enum Type {
- FavoriteCount = 1,
- RadioStatus,
- Frequency,
- Name,
- Genre,
- RadioText,
- HomePage,
- Song
- };
-}
-
-namespace RadioStatus
-{
- enum Status {
- UnSpecified,
- Playing,
- Muted,
- Seeking,
- NoAntenna
- };
-}
-
-#endif // RADIOSERVICES_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/eabi/fmradioenginewrapperu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,51 @@
+EXPORTS
+ _ZN11RadioLogger18initCombinedLoggerEv @ 1 NONAME
+ _ZN11RadioLogger21releaseCombinedLoggerEv @ 2 NONAME
+ _ZN11RadioLogger6logMsgEPKcNS_4ModeE @ 3 NONAME
+ _ZN12MethodLoggerC1EPKcS1_ @ 4 NONAME
+ _ZN12MethodLoggerC2EPKcS1_ @ 5 NONAME
+ _ZN12MethodLoggerD1Ev @ 6 NONAME
+ _ZN12MethodLoggerD2Ev @ 7 NONAME
+ _ZN18RadioEngineWrapper11addObserverEP26RadioEngineWrapperObserver @ 8 NONAME
+ _ZN18RadioEngineWrapper12setFrequencyEji @ 9 NONAME
+ _ZN18RadioEngineWrapper12startSeekingEN4Seek9DirectionEi @ 10 NONAME
+ _ZN18RadioEngineWrapper13cancelSeekingEv @ 11 NONAME
+ _ZN18RadioEngineWrapper13setRdsEnabledEb @ 12 NONAME
+ _ZN18RadioEngineWrapper14decreaseVolumeEv @ 13 NONAME
+ _ZN18RadioEngineWrapper14increaseVolumeEv @ 14 NONAME
+ _ZN18RadioEngineWrapper14removeObserverEP26RadioEngineWrapperObserver @ 15 NONAME
+ _ZN18RadioEngineWrapper16toggleAudioRouteEv @ 16 NONAME
+ _ZN18RadioEngineWrapper17setManualSeekModeEb @ 17 NONAME
+ _ZN18RadioEngineWrapper4initEv @ 18 NONAME
+ _ZN18RadioEngineWrapper7setMuteEbb @ 19 NONAME
+ _ZN18RadioEngineWrapper8settingsEv @ 20 NONAME
+ _ZN18RadioEngineWrapper9setVolumeEi @ 21 NONAME
+ _ZN18RadioEngineWrapperC1ER21RadioStationHandlerIf @ 22 NONAME
+ _ZN18RadioEngineWrapperC2ER21RadioStationHandlerIf @ 23 NONAME
+ _ZN18RadioEngineWrapperD1Ev @ 24 NONAME
+ _ZN18RadioEngineWrapperD2Ev @ 25 NONAME
+ _ZN26RadioEngineWrapperObserver11muteChangedEb @ 26 NONAME
+ _ZN26RadioEngineWrapperObserver12skipPreviousEv @ 27 NONAME
+ _ZN26RadioEngineWrapperObserver13volumeChangedEi @ 28 NONAME
+ _ZN26RadioEngineWrapperObserver14decreaseVolumeEv @ 29 NONAME
+ _ZN26RadioEngineWrapperObserver14increaseVolumeEv @ 30 NONAME
+ _ZN26RadioEngineWrapperObserver16tunedToFrequencyEji @ 31 NONAME
+ _ZN26RadioEngineWrapperObserver17audioRouteChangedEb @ 32 NONAME
+ _ZN26RadioEngineWrapperObserver18radioStatusChangedEb @ 33 NONAME
+ _ZN26RadioEngineWrapperObserver20antennaStatusChangedEb @ 34 NONAME
+ _ZN26RadioEngineWrapperObserver22rdsAvailabilityChangedEb @ 35 NONAME
+ _ZN26RadioEngineWrapperObserver8skipNextEv @ 36 NONAME
+ _ZNK18RadioEngineWrapper12maxFrequencyEv @ 37 NONAME
+ _ZNK18RadioEngineWrapper12minFrequencyEv @ 38 NONAME
+ _ZNK18RadioEngineWrapper16currentFrequencyEv @ 39 NONAME
+ _ZNK18RadioEngineWrapper16isFrequencyValidEj @ 40 NONAME
+ _ZNK18RadioEngineWrapper17frequencyStepSizeEv @ 41 NONAME
+ _ZNK18RadioEngineWrapper17isAntennaAttachedEv @ 42 NONAME
+ _ZNK18RadioEngineWrapper18isInManualSeekModeEv @ 43 NONAME
+ _ZNK18RadioEngineWrapper18isUsingLoudspeakerEv @ 44 NONAME
+ _ZNK18RadioEngineWrapper6regionEv @ 45 NONAME
+ _ZNK18RadioEngineWrapper7isMutedEv @ 46 NONAME
+ _ZNK18RadioEngineWrapper9isRadioOnEv @ 47 NONAME
+ _ZTI26RadioEngineWrapperObserver @ 48 NONAME
+ _ZTV26RadioEngineWrapperObserver @ 49 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/eabi/fmradiopresetstorageu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,14 @@
+EXPORTS
+ _ZN18RadioPresetStorage10readPresetEiR14RadioStationIf @ 1 NONAME
+ _ZN18RadioPresetStorage10savePresetERK14RadioStationIf @ 2 NONAME
+ _ZN18RadioPresetStorage12deletePresetEi @ 3 NONAME
+ _ZN18RadioPresetStorageC1Ev @ 4 NONAME
+ _ZN18RadioPresetStorageC2Ev @ 5 NONAME
+ _ZN18RadioPresetStorageD1Ev @ 6 NONAME
+ _ZN18RadioPresetStorageD2Ev @ 7 NONAME
+ _ZNK18RadioPresetStorage10nextPresetEi @ 8 NONAME
+ _ZNK18RadioPresetStorage11firstPresetEv @ 9 NONAME
+ _ZNK18RadioPresetStorage11presetCountEv @ 10 NONAME
+ _ZNK18RadioPresetStorage18maxNumberOfPresetsEv @ 11 NONAME
+ _ZN18RadioPresetStorage15readFrequenciesER5QListIjE @ 12 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/eabi/fmradiouiengineu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,254 @@
+EXPORTS
+ _ZN12RadioStation11setFavoriteEb @ 1 NONAME
+ _ZN12RadioStation12callSignCharEj @ 2 NONAME
+ _ZN12RadioStation12setFrequencyEj @ 3 NONAME
+ _ZN12RadioStation12setRadioTextERK7QString @ 4 NONAME
+ _ZN12RadioStation14callSignStringEj @ 5 NONAME
+ _ZN12RadioStation14parseFrequencyEj @ 6 NONAME
+ _ZN12RadioStation14setChangeFlagsE6QFlagsINS_10ChangeFlagEE @ 7 NONAME
+ _ZN12RadioStation14setPresetIndexEi @ 8 NONAME
+ _ZN12RadioStation15iterateCallSignEii @ 9 NONAME
+ _ZN12RadioStation16piCodeToCallSignEj @ 10 NONAME
+ _ZN12RadioStation16resetChangeFlagsEv @ 11 NONAME
+ _ZN12RadioStation16setDynamicPsTextERK7QString @ 12 NONAME
+ _ZN12RadioStation16setRadioTextPlusEiRK7QString @ 13 NONAME
+ _ZN12RadioStation18setUserDefinedNameERK7QString @ 14 NONAME
+ _ZN12RadioStation23decrementReferenceCountEv @ 15 NONAME
+ _ZN12RadioStation5resetEv @ 16 NONAME
+ _ZN12RadioStation6detachEv @ 17 NONAME
+ _ZN12RadioStation6setUrlERK7QString @ 18 NONAME
+ _ZN12RadioStation7setNameERK7QString @ 19 NONAME
+ _ZN12RadioStation7setTypeE6QFlagsINS_8TypeFlagEE @ 20 NONAME
+ _ZN12RadioStation8setGenreEi @ 21 NONAME
+ _ZN12RadioStation9setPiCodeEiN11RadioRegion6RegionE @ 22 NONAME
+ _ZN12RadioStation9setPsTypeE6QFlagsINS_10PsTypeFlagEE @ 23 NONAME
+ _ZN12RadioStation9unsetTypeE6QFlagsINS_8TypeFlagEE @ 24 NONAME
+ _ZN12RadioStationC1ERKS_ @ 25 NONAME
+ _ZN12RadioStationC1Eij @ 26 NONAME
+ _ZN12RadioStationC1Ev @ 27 NONAME
+ _ZN12RadioStationC2ERKS_ @ 28 NONAME
+ _ZN12RadioStationC2Eij @ 29 NONAME
+ _ZN12RadioStationC2Ev @ 30 NONAME
+ _ZN12RadioStationD0Ev @ 31 NONAME
+ _ZN12RadioStationD1Ev @ 32 NONAME
+ _ZN12RadioStationD2Ev @ 33 NONAME
+ _ZN12RadioStationaSERKS_ @ 34 NONAME
+ _ZN13RadioUiEngine10setPowerOnEv @ 35 NONAME
+ _ZN13RadioUiEngine10toggleMuteEv @ 36 NONAME
+ _ZN13RadioUiEngine11muteChangedEb @ 37 NONAME
+ _ZN13RadioUiEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 38 NONAME
+ _ZN13RadioUiEngine11qt_metacastEPKc @ 39 NONAME
+ _ZN13RadioUiEngine11seekStationEi @ 40 NONAME
+ _ZN13RadioUiEngine11setPowerOffEi @ 41 NONAME
+ _ZN13RadioUiEngine11skipStationEN11StationSkip4ModeEj @ 42 NONAME
+ _ZN13RadioUiEngine12historyModelEv @ 43 NONAME
+ _ZN13RadioUiEngine12setFrequencyEji @ 44 NONAME
+ _ZN13RadioUiEngine12stationModelEv @ 45 NONAME
+ _ZN13RadioUiEngine13genreToStringEiN11GenreTarget6TargetE @ 46 NONAME
+ _ZN13RadioUiEngine13scannerEngineEv @ 47 NONAME
+ _ZN13RadioUiEngine13volumeChangedEi @ 48 NONAME
+ _ZN13RadioUiEngine14openMusicStoreERK16RadioHistoryItemNS_10MusicStoreE @ 49 NONAME
+ _ZN13RadioUiEngine14seekingStartedEi @ 50 NONAME
+ _ZN13RadioUiEngine15emitMuteChangedEb @ 51 NONAME
+ _ZN13RadioUiEngine15stationsInRangeEjj @ 52 NONAME
+ _ZN13RadioUiEngine16isFirstTimeStartEv @ 53 NONAME
+ _ZN13RadioUiEngine16staticMetaObjectE @ 54 NONAME DATA 16
+ _ZN13RadioUiEngine16toggleAudioRouteEv @ 55 NONAME
+ _ZN13RadioUiEngine16tunedToFrequencyEji @ 56 NONAME
+ _ZN13RadioUiEngine17addRecognizedSongERK7QStringS2_RK12RadioStation @ 57 NONAME
+ _ZN13RadioUiEngine17audioRouteChangedEb @ 58 NONAME
+ _ZN13RadioUiEngine17emitVolumeChangedEi @ 59 NONAME
+ _ZN13RadioUiEngine17powerOffRequestedEv @ 60 NONAME
+ _ZN13RadioUiEngine17setManualSeekModeEb @ 61 NONAME
+ _ZN13RadioUiEngine18emitSeekingStartedEN4Seek9DirectionE @ 62 NONAME
+ _ZN13RadioUiEngine18lastTunedFrequencyEv @ 63 NONAME
+ _ZN13RadioUiEngine18radioStatusChangedEb @ 64 NONAME
+ _ZN13RadioUiEngine19createScannerEngineEv @ 65 NONAME
+ _ZN13RadioUiEngine19getStaticMetaObjectEv @ 66 NONAME
+ _ZN13RadioUiEngine20antennaStatusChangedEb @ 67 NONAME
+ _ZN13RadioUiEngine20emitTunedToFrequencyEji @ 68 NONAME
+ _ZN13RadioUiEngine21emitAudioRouteChangedEb @ 69 NONAME
+ _ZN13RadioUiEngine21launchSongRecognitionEv @ 70 NONAME
+ _ZN13RadioUiEngine22emitRadioStatusChangedEb @ 71 NONAME
+ _ZN13RadioUiEngine22rdsAvailabilityChangedEb @ 72 NONAME
+ _ZN13RadioUiEngine24emitAntennaStatusChangedEb @ 73 NONAME
+ _ZN13RadioUiEngine26emitRdsAvailabilityChangedEb @ 74 NONAME
+ _ZN13RadioUiEngine26setFirstTimeStartPerformedEb @ 75 NONAME
+ _ZN13RadioUiEngine29isSongRecognitionAppAvailableEv @ 76 NONAME
+ _ZN13RadioUiEngine4initEv @ 77 NONAME
+ _ZN13RadioUiEngine7setMuteEb @ 78 NONAME
+ _ZN13RadioUiEngine8settingsEv @ 79 NONAME
+ _ZN13RadioUiEngine9setVolumeEi @ 80 NONAME
+ _ZN13RadioUiEngineC1EP7QObject @ 81 NONAME
+ _ZN13RadioUiEngineC2EP7QObject @ 82 NONAME
+ _ZN13RadioUiEngineD0Ev @ 83 NONAME
+ _ZN13RadioUiEngineD1Ev @ 84 NONAME
+ _ZN13RadioUiEngineD2Ev @ 85 NONAME
+ _ZN16RadioHistoryItem10setStationERK7QString @ 86 NONAME
+ _ZN16RadioHistoryItem12setFrequencyEj @ 87 NONAME
+ _ZN16RadioHistoryItem14setCurrentTimeEv @ 88 NONAME
+ _ZN16RadioHistoryItem23decrementReferenceCountEv @ 89 NONAME
+ _ZN16RadioHistoryItem5resetEv @ 90 NONAME
+ _ZN16RadioHistoryItem6detachEv @ 91 NONAME
+ _ZN16RadioHistoryItem8setTitleERK7QString @ 92 NONAME
+ _ZN16RadioHistoryItem9setArtistERK7QString @ 93 NONAME
+ _ZN16RadioHistoryItemC1ERK7QStringS2_ @ 94 NONAME
+ _ZN16RadioHistoryItemC1ERKS_ @ 95 NONAME
+ _ZN16RadioHistoryItemC1Ev @ 96 NONAME
+ _ZN16RadioHistoryItemC2ERK7QStringS2_ @ 97 NONAME
+ _ZN16RadioHistoryItemC2ERKS_ @ 98 NONAME
+ _ZN16RadioHistoryItemC2Ev @ 99 NONAME
+ _ZN16RadioHistoryItemD0Ev @ 100 NONAME
+ _ZN16RadioHistoryItemD1Ev @ 101 NONAME
+ _ZN16RadioHistoryItemD2Ev @ 102 NONAME
+ _ZN16RadioHistoryItemaSERKS_ @ 103 NONAME
+ _ZN17RadioHistoryModel11qt_metacallEN11QMetaObject4CallEiPPv @ 104 NONAME
+ _ZN17RadioHistoryModel11qt_metacastEPKc @ 105 NONAME
+ _ZN17RadioHistoryModel13emitItemAddedEv @ 106 NONAME
+ _ZN17RadioHistoryModel13setShowTaggedEb @ 107 NONAME
+ _ZN17RadioHistoryModel13toggleTaggingERK16RadioHistoryItemi @ 108 NONAME
+ _ZN17RadioHistoryModel14setShowDetailsEb @ 109 NONAME
+ _ZN17RadioHistoryModel16addRadioTextPlusEiRK7QStringRK12RadioStation @ 110 NONAME
+ _ZN17RadioHistoryModel16currentSongResetEv @ 111 NONAME
+ _ZN17RadioHistoryModel16resetCurrentSongEv @ 112 NONAME
+ _ZN17RadioHistoryModel16staticMetaObjectE @ 113 NONAME DATA 16
+ _ZN17RadioHistoryModel17reportChangedDataEii @ 114 NONAME
+ _ZN17RadioHistoryModel18clearRadioTextPlusEv @ 115 NONAME
+ _ZN17RadioHistoryModel19getStaticMetaObjectEv @ 116 NONAME
+ _ZN17RadioHistoryModel7addItemERK7QStringS2_RK12RadioStation @ 117 NONAME
+ _ZN17RadioHistoryModel8setIconsERK5QIconS2_ @ 118 NONAME
+ _ZN17RadioHistoryModel9itemAddedEv @ 119 NONAME
+ _ZN17RadioHistoryModel9removeAllEb @ 120 NONAME
+ _ZN17RadioHistoryModelC1ER13RadioUiEngine @ 121 NONAME
+ _ZN17RadioHistoryModelC2ER13RadioUiEngine @ 122 NONAME
+ _ZN17RadioHistoryModelD0Ev @ 123 NONAME
+ _ZN17RadioHistoryModelD1Ev @ 124 NONAME
+ _ZN17RadioHistoryModelD2Ev @ 125 NONAME
+ _ZN17RadioStationModel10addStationERK12RadioStation @ 126 NONAME
+ _ZN17RadioStationModel10initializeEP18RadioPresetStorageP18RadioEngineWrapper @ 127 NONAME
+ _ZN17RadioStationModel11findClosestEjN11StationSkip4ModeE @ 128 NONAME
+ _ZN17RadioStationModel11qt_metacallEN11QMetaObject4CallEiPPv @ 129 NONAME
+ _ZN17RadioStationModel11qt_metacastEPKc @ 130 NONAME
+ _ZN17RadioStationModel11saveStationER12RadioStation @ 131 NONAME
+ _ZN17RadioStationModel12setFavoritesERK5QListI11QModelIndexE @ 132 NONAME
+ _ZN17RadioStationModel13favoriteCountEv @ 133 NONAME
+ _ZN17RadioStationModel13removeStationERK12RadioStation @ 134 NONAME
+ _ZN17RadioStationModel13renameStationEiRK7QString @ 135 NONAME
+ _ZN17RadioStationModel14currentStationEv @ 136 NONAME
+ _ZN17RadioStationModel15emitDataChangedERK12RadioStation @ 137 NONAME
+ _ZN17RadioStationModel15favoriteChangedERK12RadioStation @ 138 NONAME
+ _ZN17RadioStationModel15findPresetIndexEi @ 139 NONAME
+ _ZN17RadioStationModel15findPresetIndexEiR12RadioStation @ 140 NONAME
+ _ZN17RadioStationModel15stationsInRangeEjj @ 141 NONAME
+ _ZN17RadioStationModel16dynamicPsChangedERK12RadioStation @ 142 NONAME
+ _ZN17RadioStationModel16staticMetaObjectE @ 143 NONAME DATA 16
+ _ZN17RadioStationModel16stationHandlerIfEv @ 144 NONAME
+ _ZN17RadioStationModel17emitChangeSignalsERK12RadioStation6QFlagsINS0_10ChangeFlagEE @ 145 NONAME
+ _ZN17RadioStationModel17radioTextReceivedERK12RadioStation @ 146 NONAME
+ _ZN17RadioStationModel17removeByFrequencyEj @ 147 NONAME
+ _ZN17RadioStationModel18findCurrentStationEj @ 148 NONAME
+ _ZN17RadioStationModel18indexFromFrequencyEj @ 149 NONAME
+ _ZN17RadioStationModel18stationDataChangedERK12RadioStation @ 150 NONAME
+ _ZN17RadioStationModel19dynamicPsCheckEndedEv @ 151 NONAME
+ _ZN17RadioStationModel19getStaticMetaObjectEv @ 152 NONAME
+ _ZN17RadioStationModel19removeByPresetIndexEi @ 153 NONAME
+ _ZN17RadioStationModel19setFavoriteByPresetEib @ 154 NONAME
+ _ZN17RadioStationModel21findUnusedPresetIndexEv @ 155 NONAME
+ _ZN17RadioStationModel22setFavoriteByFrequencyEjb @ 156 NONAME
+ _ZN17RadioStationModel7setDataERK11QModelIndexRK8QVarianti @ 157 NONAME
+ _ZN17RadioStationModel8setIconsERK5QIconS2_ @ 158 NONAME
+ _ZN17RadioStationModel9removeAllENS_10RemoveModeE @ 159 NONAME
+ _ZN17RadioStationModel9setDetailE6QFlagsINS_10DetailFlagEE @ 160 NONAME
+ _ZN17RadioStationModelC1ER20RadioUiEnginePrivate @ 161 NONAME
+ _ZN17RadioStationModelC2ER20RadioUiEnginePrivate @ 162 NONAME
+ _ZN17RadioStationModelD0Ev @ 163 NONAME
+ _ZN17RadioStationModelD1Ev @ 164 NONAME
+ _ZN17RadioStationModelD2Ev @ 165 NONAME
+ _ZN18RadioScannerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 166 NONAME
+ _ZN18RadioScannerEngine11qt_metacastEPKc @ 167 NONAME
+ _ZN18RadioScannerEngine12stationFoundERK12RadioStation @ 168 NONAME
+ _ZN18RadioScannerEngine13startScanningEv @ 169 NONAME
+ _ZN18RadioScannerEngine16continueScanningEv @ 170 NONAME
+ _ZN18RadioScannerEngine16emitStationFoundERK12RadioStation @ 171 NONAME
+ _ZN18RadioScannerEngine16staticMetaObjectE @ 172 NONAME DATA 16
+ _ZN18RadioScannerEngine19addScannedFrequencyEj @ 173 NONAME
+ _ZN18RadioScannerEngine19getStaticMetaObjectEv @ 174 NONAME
+ _ZN18RadioScannerEngine6cancelEv @ 175 NONAME
+ _ZN18RadioScannerEngineC1ER20RadioUiEnginePrivate @ 176 NONAME
+ _ZN18RadioScannerEngineC2ER20RadioUiEnginePrivate @ 177 NONAME
+ _ZN18RadioScannerEngineD0Ev @ 178 NONAME
+ _ZN18RadioScannerEngineD1Ev @ 179 NONAME
+ _ZN18RadioScannerEngineD2Ev @ 180 NONAME
+ _ZNK12RadioStation10hasChangedEv @ 181 NONAME
+ _ZNK12RadioStation10isDetachedEv @ 182 NONAME
+ _ZNK12RadioStation10isFavoriteEv @ 183 NONAME
+ _ZNK12RadioStation11changeFlagsEv @ 184 NONAME
+ _ZNK12RadioStation11presetIndexEv @ 185 NONAME
+ _ZNK12RadioStation12frequencyMhzEv @ 186 NONAME
+ _ZNK12RadioStation13dynamicPsTextEv @ 187 NONAME
+ _ZNK12RadioStation14hasDataChangedE6QFlagsINS_10ChangeFlagEE @ 188 NONAME
+ _ZNK12RadioStation18nameOrFrequencyMhzEv @ 189 NONAME
+ _ZNK12RadioStation3urlEv @ 190 NONAME
+ _ZNK12RadioStation4nameEv @ 191 NONAME
+ _ZNK12RadioStation5genreEv @ 192 NONAME
+ _ZNK12RadioStation6hasRdsEv @ 193 NONAME
+ _ZNK12RadioStation6isTypeE6QFlagsINS_8TypeFlagEE @ 194 NONAME
+ _ZNK12RadioStation6psTypeEv @ 195 NONAME
+ _ZNK12RadioStation7isValidEv @ 196 NONAME
+ _ZNK12RadioStation9frequencyEv @ 197 NONAME
+ _ZNK12RadioStation9hasPiCodeEv @ 198 NONAME
+ _ZNK12RadioStation9isRenamedEv @ 199 NONAME
+ _ZNK12RadioStation9radioTextEv @ 200 NONAME
+ _ZNK13RadioUiEngine10isScanningEv @ 201 NONAME
+ _ZNK13RadioUiEngine10metaObjectEv @ 202 NONAME
+ _ZNK13RadioUiEngine12maxFrequencyEv @ 203 NONAME
+ _ZNK13RadioUiEngine12minFrequencyEv @ 204 NONAME
+ _ZNK13RadioUiEngine13isInitializedEv @ 205 NONAME
+ _ZNK13RadioUiEngine13isPoweringOffEv @ 206 NONAME
+ _ZNK13RadioUiEngine16currentFrequencyEv @ 207 NONAME
+ _ZNK13RadioUiEngine17frequencyStepSizeEv @ 208 NONAME
+ _ZNK13RadioUiEngine17isAntennaAttachedEv @ 209 NONAME
+ _ZNK13RadioUiEngine18isInManualSeekModeEv @ 210 NONAME
+ _ZNK13RadioUiEngine18isUsingLoudspeakerEv @ 211 NONAME
+ _ZNK13RadioUiEngine6regionEv @ 212 NONAME
+ _ZNK13RadioUiEngine7isMutedEv @ 213 NONAME
+ _ZNK13RadioUiEngine9isRadioOnEv @ 214 NONAME
+ _ZNK16RadioHistoryItem10isDetachedEv @ 215 NONAME
+ _ZNK16RadioHistoryItem17isRecognizedByRdsEv @ 216 NONAME
+ _ZNK16RadioHistoryItem2idEv @ 217 NONAME
+ _ZNK16RadioHistoryItem4timeEv @ 218 NONAME
+ _ZNK16RadioHistoryItem5titleEv @ 219 NONAME
+ _ZNK16RadioHistoryItem6artistEv @ 220 NONAME
+ _ZNK16RadioHistoryItem7isValidEv @ 221 NONAME
+ _ZNK16RadioHistoryItem7stationEv @ 222 NONAME
+ _ZNK16RadioHistoryItem8isTaggedEv @ 223 NONAME
+ _ZNK16RadioHistoryItem9frequencyEv @ 224 NONAME
+ _ZNK17RadioHistoryModel10metaObjectEv @ 225 NONAME
+ _ZNK17RadioHistoryModel11itemAtIndexERK11QModelIndex @ 226 NONAME
+ _ZNK17RadioHistoryModel23isCurrentSongRecognizedEv @ 227 NONAME
+ _ZNK17RadioHistoryModel4dataERK11QModelIndexi @ 228 NONAME
+ _ZNK17RadioHistoryModel8rowCountERK11QModelIndex @ 229 NONAME
+ _ZNK17RadioStationModel10metaObjectEv @ 230 NONAME
+ _ZNK17RadioStationModel13findFrequencyEjR12RadioStation @ 231 NONAME
+ _ZNK17RadioStationModel14currentStationEv @ 232 NONAME
+ _ZNK17RadioStationModel4dataERK11QModelIndexi @ 233 NONAME
+ _ZNK17RadioStationModel4listEv @ 234 NONAME
+ _ZNK17RadioStationModel5flagsERK11QModelIndex @ 235 NONAME
+ _ZNK17RadioStationModel8containsEj @ 236 NONAME
+ _ZNK17RadioStationModel8rowCountERK11QModelIndex @ 237 NONAME
+ _ZNK17RadioStationModel9stationAtEi @ 238 NONAME
+ _ZNK18RadioScannerEngine10isScanningEv @ 239 NONAME
+ _ZNK18RadioScannerEngine10metaObjectEv @ 240 NONAME
+ _ZTI12RadioStation @ 241 NONAME
+ _ZTI13RadioUiEngine @ 242 NONAME
+ _ZTI16RadioHistoryItem @ 243 NONAME
+ _ZTI17RadioHistoryModel @ 244 NONAME
+ _ZTI17RadioStationModel @ 245 NONAME
+ _ZTI18RadioScannerEngine @ 246 NONAME
+ _ZTV12RadioStation @ 247 NONAME
+ _ZTV13RadioUiEngine @ 248 NONAME
+ _ZTV16RadioHistoryItem @ 249 NONAME
+ _ZTV17RadioHistoryModel @ 250 NONAME
+ _ZTV17RadioStationModel @ 251 NONAME
+ _ZTV18RadioScannerEngine @ 252 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/eabi/fmradiowidgetsu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,152 @@
+EXPORTS
+ _ZN11RadioWindow11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
+ _ZN11RadioWindow11qt_metacastEPKc @ 2 NONAME
+ _ZN11RadioWindow12activateViewEP13RadioViewBaseRK7QString6QFlagsIN2Hb14ViewSwitchFlagEE @ 3 NONAME
+ _ZN11RadioWindow15showVolumeLevelEi @ 4 NONAME
+ _ZN11RadioWindow16activateMainViewEv @ 5 NONAME
+ _ZN11RadioWindow16showErrorMessageERK7QString @ 6 NONAME
+ _ZN11RadioWindow16staticMetaObjectE @ 7 NONAME DATA 16
+ _ZN11RadioWindow17queryOfflineUsageEN10QtMobility17QSystemDeviceInfo7ProfileE @ 8 NONAME
+ _ZN11RadioWindow17updateOrientationEN2Qt11OrientationE @ 9 NONAME
+ _ZN11RadioWindow18orientationSectionEv @ 10 NONAME
+ _ZN11RadioWindow19activateHistoryViewEv @ 11 NONAME
+ _ZN11RadioWindow19getStaticMetaObjectEv @ 12 NONAME
+ _ZN11RadioWindow19updateAntennaStatusEb @ 13 NONAME
+ _ZN11RadioWindow20activateStationsViewEv @ 14 NONAME
+ _ZN11RadioWindow4initEPN10QtMobility17QSystemDeviceInfoE @ 15 NONAME
+ _ZN11RadioWindow8initViewEv @ 16 NONAME
+ _ZN11RadioWindowC1EP7QWidget @ 17 NONAME
+ _ZN11RadioWindowC2EP7QWidget @ 18 NONAME
+ _ZN11RadioWindowD0Ev @ 19 NONAME
+ _ZN11RadioWindowD1Ev @ 20 NONAME
+ _ZN11RadioWindowD2Ev @ 21 NONAME
+ _ZN16RadioFadingLabel11qt_metacallEN11QMetaObject4CallEiPPv @ 22 NONAME
+ _ZN16RadioFadingLabel11qt_metacastEPKc @ 23 NONAME
+ _ZN16RadioFadingLabel11startEffectERK7QStringPKc @ 24 NONAME
+ _ZN16RadioFadingLabel14effectFinishedEN8HbEffect12EffectStatusE @ 25 NONAME
+ _ZN16RadioFadingLabel16setFadingEnabledEb @ 26 NONAME
+ _ZN16RadioFadingLabel16staticMetaObjectE @ 27 NONAME DATA 16
+ _ZN16RadioFadingLabel19getStaticMetaObjectEv @ 28 NONAME
+ _ZN16RadioFadingLabel20setTextWithoutFadingERK7QString @ 29 NONAME
+ _ZN16RadioFadingLabel7setTextERK7QString @ 30 NONAME
+ _ZN16RadioFadingLabel8trimHtmlERK7QString @ 31 NONAME
+ _ZN16RadioFadingLabelC1EP13QGraphicsItem @ 32 NONAME
+ _ZN16RadioFadingLabelC2EP13QGraphicsItem @ 33 NONAME
+ _ZN19RadioFrequencyStrip10drawPixmapEj5QListI12RadioStationEP18RadioFrequencyItem @ 34 NONAME
+ _ZN19RadioFrequencyStrip10timerEventEP11QTimerEvent @ 35 NONAME
+ _ZN19RadioFrequencyStrip10updateItemEP18RadioFrequencyItemjj @ 36 NONAME
+ _ZN19RadioFrequencyStrip11changeEventEP6QEvent @ 37 NONAME
+ _ZN19RadioFrequencyStrip11hideButtonsEv @ 38 NONAME
+ _ZN19RadioFrequencyStrip11initButtonsEv @ 39 NONAME
+ _ZN19RadioFrequencyStrip11qt_metacallEN11QMetaObject4CallEiPPv @ 40 NONAME
+ _ZN19RadioFrequencyStrip11qt_metacastEPKc @ 41 NONAME
+ _ZN19RadioFrequencyStrip11resizeEventEP25QGraphicsSceneResizeEvent @ 42 NONAME
+ _ZN19RadioFrequencyStrip11showButtonsEv @ 43 NONAME
+ _ZN19RadioFrequencyStrip12gestureEventEP13QGestureEvent @ 44 NONAME
+ _ZN19RadioFrequencyStrip12initSelectorEv @ 45 NONAME
+ _ZN19RadioFrequencyStrip12setFrequencyEjiN6Scroll9DirectionE @ 46 NONAME
+ _ZN19RadioFrequencyStrip13initPositionsEv @ 47 NONAME
+ _ZN19RadioFrequencyStrip13removeStationERK11QModelIndexii @ 48 NONAME
+ _ZN19RadioFrequencyStrip13seekRequestedEi @ 49 NONAME
+ _ZN19RadioFrequencyStrip13skipRequestedEi @ 50 NONAME
+ _ZN19RadioFrequencyStrip13updateStationERK11QModelIndexii @ 51 NONAME
+ _ZN19RadioFrequencyStrip14initEmptyItemsEv @ 52 NONAME
+ _ZN19RadioFrequencyStrip14updateAllItemsEv @ 53 NONAME
+ _ZN19RadioFrequencyStrip14updateFavoriteERK12RadioStation @ 54 NONAME
+ _ZN19RadioFrequencyStrip15addFrequencyPosEijP18RadioFrequencyItem @ 55 NONAME
+ _ZN19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 56 NONAME
+ _ZN19RadioFrequencyStrip15setScanningModeEb @ 57 NONAME
+ _ZN19RadioFrequencyStrip16cancelManualSeekEv @ 58 NONAME
+ _ZN19RadioFrequencyStrip16frequencyChangedEjii @ 59 NONAME
+ _ZN19RadioFrequencyStrip16handleLeftButtonEv @ 60 NONAME
+ _ZN19RadioFrequencyStrip16scrollPosChangedE7QPointF @ 61 NONAME
+ _ZN19RadioFrequencyStrip16staticMetaObjectE @ 62 NONAME DATA 16
+ _ZN19RadioFrequencyStrip16toggleManualSeekEv @ 63 NONAME
+ _ZN19RadioFrequencyStrip17addScannedStationERK12RadioStation @ 64 NONAME
+ _ZN19RadioFrequencyStrip17handleRightButtonEv @ 65 NONAME
+ _ZN19RadioFrequencyStrip17manualSeekChangedEb @ 66 NONAME
+ _ZN19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 67 NONAME
+ _ZN19RadioFrequencyStrip17scrollToFrequencyEjN6Scroll9DirectionEiN10TuneReason6ReasonE @ 68 NONAME
+ _ZN19RadioFrequencyStrip18handleScrollingEndEv @ 69 NONAME
+ _ZN19RadioFrequencyStrip19createItemPrimitiveEP13QGraphicsItem @ 70 NONAME
+ _ZN19RadioFrequencyStrip19getStaticMetaObjectEv @ 71 NONAME
+ _ZN19RadioFrequencyStrip19updateItemPrimitiveEP13QGraphicsItemi @ 72 NONAME
+ _ZN19RadioFrequencyStrip20emitFrequencyChangedEj @ 73 NONAME
+ _ZN19RadioFrequencyStrip20handleLongLeftButtonEv @ 74 NONAME
+ _ZN19RadioFrequencyStrip21handleLongRightButtonEv @ 75 NONAME
+ _ZN19RadioFrequencyStrip21updateStationsInRangeEiib @ 76 NONAME
+ _ZN19RadioFrequencyStrip4initEP13RadioUiEngineR13RadioUiLoader @ 77 NONAME
+ _ZN19RadioFrequencyStrip9initModelEv @ 78 NONAME
+ _ZN19RadioFrequencyStripC1Ev @ 79 NONAME
+ _ZN19RadioFrequencyStripC2Ev @ 80 NONAME
+ _ZN20RadioStationCarousel10timerFiredEv @ 81 NONAME
+ _ZN20RadioStationCarousel11qt_metacallEN11QMetaObject4CallEiPPv @ 82 NONAME
+ _ZN20RadioStationCarousel11qt_metacastEPKc @ 83 NONAME
+ _ZN20RadioStationCarousel11resizeEventEP25QGraphicsSceneResizeEvent @ 84 NONAME
+ _ZN20RadioStationCarousel11setInfoTextEN16CarouselInfoText4TypeE @ 85 NONAME
+ _ZN20RadioStationCarousel12cleanRdsDataEv @ 86 NONAME
+ _ZN20RadioStationCarousel12gestureEventEP13QGestureEvent @ 87 NONAME
+ _ZN20RadioStationCarousel12setFrequencyEjiN6Scroll9DirectionE @ 88 NONAME
+ _ZN20RadioStationCarousel13clearInfoTextEv @ 89 NONAME
+ _ZN20RadioStationCarousel13scrollToIndexEiN6Scroll9DirectionE6QFlagsINS_10ScrollFlagEE @ 90 NONAME
+ _ZN20RadioStationCarousel13skipRequestedEi @ 91 NONAME
+ _ZN20RadioStationCarousel14setCenterIndexEi6QFlagsINS_10ScrollFlagEE @ 92 NONAME
+ _ZN20RadioStationCarousel14toggleFavoriteEv @ 93 NONAME
+ _ZN20RadioStationCarousel14updateStationsEv @ 94 NONAME
+ _ZN20RadioStationCarousel15cancelAnimationEv @ 95 NONAME
+ _ZN20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 96 NONAME
+ _ZN20RadioStationCarousel15setFavoriteIconERK6HbIcon @ 97 NONAME
+ _ZN20RadioStationCarousel15setScanningModeEb @ 98 NONAME
+ _ZN20RadioStationCarousel15updateRadioTextERK12RadioStation @ 99 NONAME
+ _ZN20RadioStationCarousel16frequencyChangedEjii @ 100 NONAME
+ _ZN20RadioStationCarousel16scrollPosChangedERK7QPointF @ 101 NONAME
+ _ZN20RadioStationCarousel16staticMetaObjectE @ 102 NONAME DATA 16
+ _ZN20RadioStationCarousel17adjustAfterScrollEv @ 103 NONAME
+ _ZN20RadioStationCarousel17animateNewStationERK12RadioStation @ 104 NONAME
+ _ZN20RadioStationCarousel17setAutoScrollTimeEi @ 105 NONAME
+ _ZN20RadioStationCarousel17setManualSeekModeEb @ 106 NONAME
+ _ZN20RadioStationCarousel18setNonFavoriteIconERK6HbIcon @ 107 NONAME
+ _ZN20RadioStationCarousel19calculateDifferenceEiRN6Scroll9DirectionE @ 108 NONAME
+ _ZN20RadioStationCarousel19getStaticMetaObjectEv @ 109 NONAME
+ _ZN20RadioStationCarousel19updateAntennaStatusEb @ 110 NONAME
+ _ZN20RadioStationCarousel21scanAnimationFinishedEv @ 111 NONAME
+ _ZN20RadioStationCarousel24setAlternateSkippingModeEb @ 112 NONAME
+ _ZN20RadioStationCarousel4initER13RadioUiLoaderP13RadioUiEngine @ 113 NONAME
+ _ZN20RadioStationCarousel4skipEN11StationSkip4ModeE @ 114 NONAME
+ _ZN20RadioStationCarousel6updateERK12RadioStation @ 115 NONAME
+ _ZN20RadioStationCarousel8uiEngineEv @ 116 NONAME
+ _ZN20RadioStationCarousel9adjustPosEi @ 117 NONAME
+ _ZN20RadioStationCarousel9nextIndexEi @ 118 NONAME
+ _ZN20RadioStationCarousel9prevIndexEi @ 119 NONAME
+ _ZN20RadioStationCarousel9showEventEP10QShowEvent @ 120 NONAME
+ _ZN20RadioStationCarousel9trimIndexEi @ 121 NONAME
+ _ZN20RadioStationCarouselC1EP13QGraphicsItem @ 122 NONAME
+ _ZN20RadioStationCarouselC2EP13QGraphicsItem @ 123 NONAME
+ _ZNK11RadioWindow10metaObjectEv @ 124 NONAME
+ _ZNK16RadioFadingLabel10metaObjectEv @ 125 NONAME
+ _ZNK19RadioFrequencyStrip10metaObjectEv @ 126 NONAME
+ _ZNK19RadioFrequencyStrip11selectorPosEv @ 127 NONAME
+ _ZNK19RadioFrequencyStrip18isInManualSeekModeEv @ 128 NONAME
+ _ZNK19RadioFrequencyStrip9frequencyEv @ 129 NONAME
+ _ZNK20RadioStationCarousel10metaObjectEv @ 130 NONAME
+ _ZNK20RadioStationCarousel12favoriteIconEv @ 131 NONAME
+ _ZNK20RadioStationCarousel13isInitializedEv @ 132 NONAME
+ _ZNK20RadioStationCarousel14autoScrollTimeEv @ 133 NONAME
+ _ZNK20RadioStationCarousel15nonFavoriteIconEv @ 134 NONAME
+ _ZNK20RadioStationCarousel16isInScanningModeEv @ 135 NONAME
+ _ZNK20RadioStationCarousel17isAntennaAttachedEv @ 136 NONAME
+ _ZNK20RadioStationCarousel18isScrollingAllowedEv @ 137 NONAME
+ _ZTI11RadioWindow @ 138 NONAME
+ _ZTI16RadioFadingLabel @ 139 NONAME
+ _ZTI19RadioFrequencyStrip @ 140 NONAME
+ _ZTI20RadioStationCarousel @ 141 NONAME
+ _ZTV11RadioWindow @ 142 NONAME
+ _ZTV16RadioFadingLabel @ 143 NONAME
+ _ZTV19RadioFrequencyStrip @ 144 NONAME
+ _ZTV20RadioStationCarousel @ 145 NONAME
+ _ZThn8_N11RadioWindowD0Ev @ 146 NONAME
+ _ZThn8_N11RadioWindowD1Ev @ 147 NONAME
+ _ZThn8_N19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 148 NONAME
+ _ZThn8_N19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 149 NONAME
+ _ZThn8_N20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 150 NONAME
+
--- a/radioapp/eabi/radioenginewrapperu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-EXPORTS
- _ZN11RadioLogger18initCombinedLoggerEv @ 1 NONAME
- _ZN11RadioLogger21releaseCombinedLoggerEv @ 2 NONAME
- _ZN11RadioLogger6logMsgEPKcNS_4ModeE @ 3 NONAME
- _ZN12MethodLoggerC1EPKcS1_ @ 4 NONAME
- _ZN12MethodLoggerC2EPKcS1_ @ 5 NONAME
- _ZN12MethodLoggerD1Ev @ 6 NONAME
- _ZN12MethodLoggerD2Ev @ 7 NONAME
- _ZN18RadioEngineWrapper11addObserverEP26RadioEngineWrapperObserver @ 8 NONAME
- _ZN18RadioEngineWrapper12startSeekingEN7Seeking9DirectionEi @ 9 NONAME
- _ZN18RadioEngineWrapper13cancelSeekingEv @ 10 NONAME
- _ZN18RadioEngineWrapper13tuneFrequencyEji @ 11 NONAME
- _ZN18RadioEngineWrapper13tuneWithDelayEji @ 12 NONAME
- _ZN18RadioEngineWrapper14removeObserverEP26RadioEngineWrapperObserver @ 13 NONAME
- _ZN18RadioEngineWrapper16isFrequencyValidEj @ 14 NONAME
- _ZN18RadioEngineWrapper16toggleAudioRouteEv @ 15 NONAME
- _ZN18RadioEngineWrapper19isEngineConstructedEv @ 16 NONAME
- _ZN18RadioEngineWrapper7setMuteEb @ 17 NONAME
- _ZN18RadioEngineWrapper8settingsEv @ 18 NONAME
- _ZN18RadioEngineWrapper9setVolumeEi @ 19 NONAME
- _ZN18RadioEngineWrapperC1ER21RadioStationHandlerIf @ 20 NONAME
- _ZN18RadioEngineWrapperC2ER21RadioStationHandlerIf @ 21 NONAME
- _ZN18RadioEngineWrapperD1Ev @ 22 NONAME
- _ZN18RadioEngineWrapperD2Ev @ 23 NONAME
- _ZN26RadioEngineWrapperObserver11muteChangedEb @ 24 NONAME
- _ZN26RadioEngineWrapperObserver12skipPreviousEv @ 25 NONAME
- _ZN26RadioEngineWrapperObserver13volumeChangedEi @ 26 NONAME
- _ZN26RadioEngineWrapperObserver16tunedToFrequencyEji @ 27 NONAME
- _ZN26RadioEngineWrapperObserver17audioRouteChangedEb @ 28 NONAME
- _ZN26RadioEngineWrapperObserver18radioStatusChangedEb @ 29 NONAME
- _ZN26RadioEngineWrapperObserver20antennaStatusChangedEb @ 30 NONAME
- _ZN26RadioEngineWrapperObserver22rdsAvailabilityChangedEb @ 31 NONAME
- _ZN26RadioEngineWrapperObserver8skipNextEv @ 32 NONAME
- _ZNK18RadioEngineWrapper12maxFrequencyEv @ 33 NONAME
- _ZNK18RadioEngineWrapper12minFrequencyEv @ 34 NONAME
- _ZNK18RadioEngineWrapper16currentFrequencyEv @ 35 NONAME
- _ZNK18RadioEngineWrapper17frequencyStepSizeEv @ 36 NONAME
- _ZNK18RadioEngineWrapper17isAntennaAttachedEv @ 37 NONAME
- _ZNK18RadioEngineWrapper18isUsingLoudspeakerEv @ 38 NONAME
- _ZNK18RadioEngineWrapper6regionEv @ 39 NONAME
- _ZNK18RadioEngineWrapper7isMutedEv @ 40 NONAME
- _ZNK18RadioEngineWrapper9isRadioOnEv @ 41 NONAME
- _ZTI26RadioEngineWrapperObserver @ 42 NONAME
- _ZTV26RadioEngineWrapperObserver @ 43 NONAME
-
--- a/radioapp/eabi/radiopresetstorageu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXPORTS
- _ZN18RadioPresetStorage10readPresetEiR14RadioStationIf @ 1 NONAME
- _ZN18RadioPresetStorage10savePresetERK14RadioStationIf @ 2 NONAME
- _ZN18RadioPresetStorage12deletePresetEi @ 3 NONAME
- _ZN18RadioPresetStorageC1Ev @ 4 NONAME
- _ZN18RadioPresetStorageC2Ev @ 5 NONAME
- _ZN18RadioPresetStorageD1Ev @ 6 NONAME
- _ZN18RadioPresetStorageD2Ev @ 7 NONAME
- _ZNK18RadioPresetStorage10nextPresetEi @ 8 NONAME
- _ZNK18RadioPresetStorage11firstPresetEv @ 9 NONAME
- _ZNK18RadioPresetStorage11presetCountEv @ 10 NONAME
- _ZNK18RadioPresetStorage18maxNumberOfPresetsEv @ 11 NONAME
-
--- a/radioapp/eabi/radiouiengineu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,283 +0,0 @@
-EXPORTS
- _ZN12RadioStation11setFavoriteEb @ 1 NONAME
- _ZN12RadioStation12callSignCharEj @ 2 NONAME
- _ZN12RadioStation12setFrequencyEj @ 3 NONAME
- _ZN12RadioStation12setRadioTextERK7QString @ 4 NONAME
- _ZN12RadioStation14callSignStringEj @ 5 NONAME
- _ZN12RadioStation14parseFrequencyEj @ 6 NONAME
- _ZN12RadioStation14setChangeFlagsE6QFlagsINS_10ChangeFlagEE @ 7 NONAME
- _ZN12RadioStation14setPresetIndexEi @ 8 NONAME
- _ZN12RadioStation15iterateCallSignEii @ 9 NONAME
- _ZN12RadioStation16piCodeToCallSignEj @ 10 NONAME
- _ZN12RadioStation16resetChangeFlagsEv @ 11 NONAME
- _ZN12RadioStation16setDynamicPsTextERK7QString @ 12 NONAME
- _ZN12RadioStation16setRadioTextPlusEiRK7QString @ 13 NONAME
- _ZN12RadioStation18setUserDefinedNameERK7QString @ 14 NONAME
- _ZN12RadioStation23decrementReferenceCountEv @ 15 NONAME
- _ZN12RadioStation5resetEv @ 16 NONAME
- _ZN12RadioStation6detachEv @ 17 NONAME
- _ZN12RadioStation6setUrlERK7QString @ 18 NONAME
- _ZN12RadioStation7setNameERK7QString @ 19 NONAME
- _ZN12RadioStation7setTypeE6QFlagsINS_8TypeFlagEE @ 20 NONAME
- _ZN12RadioStation8setGenreEi @ 21 NONAME
- _ZN12RadioStation9setPiCodeEiN11RadioRegion6RegionE @ 22 NONAME
- _ZN12RadioStation9setPsTypeE6QFlagsINS_10PsTypeFlagEE @ 23 NONAME
- _ZN12RadioStation9unsetTypeE6QFlagsINS_8TypeFlagEE @ 24 NONAME
- _ZN12RadioStationC1ERKS_ @ 25 NONAME
- _ZN12RadioStationC1Eij @ 26 NONAME
- _ZN12RadioStationC1Ev @ 27 NONAME
- _ZN12RadioStationC2ERKS_ @ 28 NONAME
- _ZN12RadioStationC2Eij @ 29 NONAME
- _ZN12RadioStationC2Ev @ 30 NONAME
- _ZN12RadioStationD0Ev @ 31 NONAME
- _ZN12RadioStationD1Ev @ 32 NONAME
- _ZN12RadioStationD2Ev @ 33 NONAME
- _ZN12RadioStationaSERKS_ @ 34 NONAME
- _ZN13RadioUiEngine10toggleMuteEv @ 35 NONAME
- _ZN13RadioUiEngine10tunePresetEi @ 36 NONAME
- _ZN13RadioUiEngine11muteChangedEb @ 37 NONAME
- _ZN13RadioUiEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 38 NONAME
- _ZN13RadioUiEngine11qt_metacastEPKc @ 39 NONAME
- _ZN13RadioUiEngine11seekStationEi @ 40 NONAME
- _ZN13RadioUiEngine11skipStationEN11StationSkip4ModeEj @ 41 NONAME
- _ZN13RadioUiEngine12historyModelEv @ 42 NONAME
- _ZN13RadioUiEngine12stationModelEv @ 43 NONAME
- _ZN13RadioUiEngine13carouselModelEv @ 44 NONAME
- _ZN13RadioUiEngine13genreToStringEiN11GenreTarget6TargetE @ 45 NONAME
- _ZN13RadioUiEngine13scannerEngineEv @ 46 NONAME
- _ZN13RadioUiEngine13tuneFrequencyEji @ 47 NONAME
- _ZN13RadioUiEngine13tuneWithDelayEji @ 48 NONAME
- _ZN13RadioUiEngine13volumeChangedEi @ 49 NONAME
- _ZN13RadioUiEngine14seekingStartedEi @ 50 NONAME
- _ZN13RadioUiEngine15emitMuteChangedEb @ 51 NONAME
- _ZN13RadioUiEngine15stationsInRangeEjj @ 52 NONAME
- _ZN13RadioUiEngine16isFirstTimeStartEv @ 53 NONAME
- _ZN13RadioUiEngine16isOfflineProfileEv @ 54 NONAME
- _ZN13RadioUiEngine16staticMetaObjectE @ 55 NONAME DATA 16
- _ZN13RadioUiEngine16toggleAudioRouteEv @ 56 NONAME
- _ZN13RadioUiEngine16tunedToFrequencyEji @ 57 NONAME
- _ZN13RadioUiEngine17addRecognizedSongERK7QStringS2_RK12RadioStation @ 58 NONAME
- _ZN13RadioUiEngine17audioRouteChangedEb @ 59 NONAME
- _ZN13RadioUiEngine17emitVolumeChangedEi @ 60 NONAME
- _ZN13RadioUiEngine18emitSeekingStartedEN7Seeking9DirectionE @ 61 NONAME
- _ZN13RadioUiEngine18lastTunedFrequencyEv @ 62 NONAME
- _ZN13RadioUiEngine18radioStatusChangedEb @ 63 NONAME
- _ZN13RadioUiEngine19getStaticMetaObjectEv @ 64 NONAME
- _ZN13RadioUiEngine20antennaStatusChangedEb @ 65 NONAME
- _ZN13RadioUiEngine20createNewFilterModelEP7QObject @ 66 NONAME
- _ZN13RadioUiEngine20emitTunedToFrequencyEji @ 67 NONAME
- _ZN13RadioUiEngine21emitAudioRouteChangedEb @ 68 NONAME
- _ZN13RadioUiEngine21launchSongRecognitionEv @ 69 NONAME
- _ZN13RadioUiEngine22emitRadioStatusChangedEb @ 70 NONAME
- _ZN13RadioUiEngine22rdsAvailabilityChangedEb @ 71 NONAME
- _ZN13RadioUiEngine24emitAntennaStatusChangedEb @ 72 NONAME
- _ZN13RadioUiEngine26emitRdsAvailabilityChangedEb @ 73 NONAME
- _ZN13RadioUiEngine29isSongRecognitionAppAvailableEv @ 74 NONAME
- _ZN13RadioUiEngine4initEv @ 75 NONAME
- _ZN13RadioUiEngine7setMuteEb @ 76 NONAME
- _ZN13RadioUiEngine8settingsEv @ 77 NONAME
- _ZN13RadioUiEngine9setVolumeEi @ 78 NONAME
- _ZN13RadioUiEngineC1EP7QObject @ 79 NONAME
- _ZN13RadioUiEngineC2EP7QObject @ 80 NONAME
- _ZN13RadioUiEngineD0Ev @ 81 NONAME
- _ZN13RadioUiEngineD1Ev @ 82 NONAME
- _ZN13RadioUiEngineD2Ev @ 83 NONAME
- _ZN16RadioHistoryItem10setStationERK7QString @ 84 NONAME
- _ZN16RadioHistoryItem12setFrequencyEj @ 85 NONAME
- _ZN16RadioHistoryItem14setCurrentTimeEv @ 86 NONAME
- _ZN16RadioHistoryItem23decrementReferenceCountEv @ 87 NONAME
- _ZN16RadioHistoryItem5resetEv @ 88 NONAME
- _ZN16RadioHistoryItem6detachEv @ 89 NONAME
- _ZN16RadioHistoryItem8setTitleERK7QString @ 90 NONAME
- _ZN16RadioHistoryItem9setArtistERK7QString @ 91 NONAME
- _ZN16RadioHistoryItemC1ERK7QStringS2_ @ 92 NONAME
- _ZN16RadioHistoryItemC1ERKS_ @ 93 NONAME
- _ZN16RadioHistoryItemC1Ev @ 94 NONAME
- _ZN16RadioHistoryItemC2ERK7QStringS2_ @ 95 NONAME
- _ZN16RadioHistoryItemC2ERKS_ @ 96 NONAME
- _ZN16RadioHistoryItemC2Ev @ 97 NONAME
- _ZN16RadioHistoryItemD0Ev @ 98 NONAME
- _ZN16RadioHistoryItemD1Ev @ 99 NONAME
- _ZN16RadioHistoryItemD2Ev @ 100 NONAME
- _ZN16RadioHistoryItemaSERKS_ @ 101 NONAME
- _ZN17RadioHistoryModel11qt_metacallEN11QMetaObject4CallEiPPv @ 102 NONAME
- _ZN17RadioHistoryModel11qt_metacastEPKc @ 103 NONAME
- _ZN17RadioHistoryModel13emitItemAddedEv @ 104 NONAME
- _ZN17RadioHistoryModel13setShowTaggedEb @ 105 NONAME
- _ZN17RadioHistoryModel13toggleTaggingERK16RadioHistoryItemi @ 106 NONAME
- _ZN17RadioHistoryModel14setShowDetailsEb @ 107 NONAME
- _ZN17RadioHistoryModel16addRadioTextPlusEiRK7QStringRK12RadioStation @ 108 NONAME
- _ZN17RadioHistoryModel16currentSongResetEv @ 109 NONAME
- _ZN17RadioHistoryModel16resetCurrentSongEv @ 110 NONAME
- _ZN17RadioHistoryModel16staticMetaObjectE @ 111 NONAME DATA 16
- _ZN17RadioHistoryModel17reportChangedDataEii @ 112 NONAME
- _ZN17RadioHistoryModel18clearRadioTextPlusEv @ 113 NONAME
- _ZN17RadioHistoryModel19getStaticMetaObjectEv @ 114 NONAME
- _ZN17RadioHistoryModel7addItemERK7QStringS2_RK12RadioStation @ 115 NONAME
- _ZN17RadioHistoryModel8setIconsERK5QIconS2_ @ 116 NONAME
- _ZN17RadioHistoryModel9itemAddedEv @ 117 NONAME
- _ZN17RadioHistoryModel9removeAllEv @ 118 NONAME
- _ZN17RadioHistoryModelC1ER13RadioUiEngine @ 119 NONAME
- _ZN17RadioHistoryModelC2ER13RadioUiEngine @ 120 NONAME
- _ZN17RadioHistoryModelD0Ev @ 121 NONAME
- _ZN17RadioHistoryModelD1Ev @ 122 NONAME
- _ZN17RadioHistoryModelD2Ev @ 123 NONAME
- _ZN17RadioStationModel10addStationERK12RadioStation @ 124 NONAME
- _ZN17RadioStationModel10initializeEP18RadioPresetStorageP18RadioEngineWrapper @ 125 NONAME
- _ZN17RadioStationModel11findClosestEjN11StationSkip4ModeE @ 126 NONAME
- _ZN17RadioStationModel11qt_metacallEN11QMetaObject4CallEiPPv @ 127 NONAME
- _ZN17RadioStationModel11qt_metacastEPKc @ 128 NONAME
- _ZN17RadioStationModel11saveStationER12RadioStation @ 129 NONAME
- _ZN17RadioStationModel12setFavoritesERK5QListI11QModelIndexE @ 130 NONAME
- _ZN17RadioStationModel13favoriteCountEv @ 131 NONAME
- _ZN17RadioStationModel13findFrequencyEjR12RadioStation @ 132 NONAME
- _ZN17RadioStationModel13removeStationERK12RadioStation @ 133 NONAME
- _ZN17RadioStationModel13renameStationEiRK7QString @ 134 NONAME
- _ZN17RadioStationModel14currentStationEv @ 135 NONAME
- _ZN17RadioStationModel15emitDataChangedERK12RadioStation @ 136 NONAME
- _ZN17RadioStationModel15favoriteChangedERK12RadioStation @ 137 NONAME
- _ZN17RadioStationModel15findPresetIndexEi @ 138 NONAME
- _ZN17RadioStationModel15findPresetIndexEiR12RadioStation @ 139 NONAME
- _ZN17RadioStationModel15stationsInRangeEjj @ 140 NONAME
- _ZN17RadioStationModel16dynamicPsChangedERK12RadioStation @ 141 NONAME
- _ZN17RadioStationModel16staticMetaObjectE @ 142 NONAME DATA 16
- _ZN17RadioStationModel16stationHandlerIfEv @ 143 NONAME
- _ZN17RadioStationModel17emitChangeSignalsERK12RadioStation6QFlagsINS0_10ChangeFlagEE @ 144 NONAME
- _ZN17RadioStationModel17radioTextReceivedERK12RadioStation @ 145 NONAME
- _ZN17RadioStationModel17removeByFrequencyEj @ 146 NONAME
- _ZN17RadioStationModel18findCurrentStationEj @ 147 NONAME
- _ZN17RadioStationModel18stationDataChangedERK12RadioStation @ 148 NONAME
- _ZN17RadioStationModel19dynamicPsCheckEndedEv @ 149 NONAME
- _ZN17RadioStationModel19getStaticMetaObjectEv @ 150 NONAME
- _ZN17RadioStationModel19removeByPresetIndexEi @ 151 NONAME
- _ZN17RadioStationModel19setFavoriteByPresetEib @ 152 NONAME
- _ZN17RadioStationModel21findUnusedPresetIndexEv @ 153 NONAME
- _ZN17RadioStationModel22setFavoriteByFrequencyEjb @ 154 NONAME
- _ZN17RadioStationModel23modelIndexFromFrequencyEj @ 155 NONAME
- _ZN17RadioStationModel7setDataERK11QModelIndexRK8QVarianti @ 156 NONAME
- _ZN17RadioStationModel8setIconsERK5QIconS2_ @ 157 NONAME
- _ZN17RadioStationModel9removeAllENS_10RemoveModeE @ 158 NONAME
- _ZN17RadioStationModel9setDetailE6QFlagsINS_10DetailFlagEE @ 159 NONAME
- _ZN17RadioStationModelC1ER20RadioUiEnginePrivate @ 160 NONAME
- _ZN17RadioStationModelC2ER20RadioUiEnginePrivate @ 161 NONAME
- _ZN17RadioStationModelD0Ev @ 162 NONAME
- _ZN17RadioStationModelD1Ev @ 163 NONAME
- _ZN17RadioStationModelD2Ev @ 164 NONAME
- _ZN18RadioCarouselModel11findClosestEjN11StationSkip4ModeE @ 165 NONAME
- _ZN18RadioCarouselModel11qt_metacallEN11QMetaObject4CallEiPPv @ 166 NONAME
- _ZN18RadioCarouselModel11qt_metacastEPKc @ 167 NONAME
- _ZN18RadioCarouselModel15removeFrequencyERK11QModelIndexii @ 168 NONAME
- _ZN18RadioCarouselModel16staticMetaObjectE @ 169 NONAME DATA 16
- _ZN18RadioCarouselModel19getStaticMetaObjectEv @ 170 NONAME
- _ZN18RadioCarouselModel23modelIndexFromFrequencyEj @ 171 NONAME
- _ZN18RadioCarouselModelC1ER13RadioUiEngineR17RadioStationModel @ 172 NONAME
- _ZN18RadioCarouselModelC2ER13RadioUiEngineR17RadioStationModel @ 173 NONAME
- _ZN18RadioCarouselModelD0Ev @ 174 NONAME
- _ZN18RadioCarouselModelD1Ev @ 175 NONAME
- _ZN18RadioCarouselModelD2Ev @ 176 NONAME
- _ZN18RadioScannerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 177 NONAME
- _ZN18RadioScannerEngine11qt_metacastEPKc @ 178 NONAME
- _ZN18RadioScannerEngine12stationFoundERK12RadioStation @ 179 NONAME
- _ZN18RadioScannerEngine13startScanningEv @ 180 NONAME
- _ZN18RadioScannerEngine16continueScanningEv @ 181 NONAME
- _ZN18RadioScannerEngine16emitStationFoundERK12RadioStation @ 182 NONAME
- _ZN18RadioScannerEngine16staticMetaObjectE @ 183 NONAME DATA 16
- _ZN18RadioScannerEngine19addScannedFrequencyEj @ 184 NONAME
- _ZN18RadioScannerEngine19getStaticMetaObjectEv @ 185 NONAME
- _ZN18RadioScannerEngine6cancelEv @ 186 NONAME
- _ZN18RadioScannerEngineC1ER20RadioUiEnginePrivate @ 187 NONAME
- _ZN18RadioScannerEngineC2ER20RadioUiEnginePrivate @ 188 NONAME
- _ZN18RadioScannerEngineD0Ev @ 189 NONAME
- _ZN18RadioScannerEngineD1Ev @ 190 NONAME
- _ZN18RadioScannerEngineD2Ev @ 191 NONAME
- _ZN23RadioStationFilterModel13setTypeFilterE6QFlagsIN12RadioStation8TypeFlagEE @ 192 NONAME
- _ZN23RadioStationFilterModel23modelIndexFromFrequencyEj @ 193 NONAME
- _ZN23RadioStationFilterModel9setCyclicEb @ 194 NONAME
- _ZN23RadioStationFilterModelC1ER13RadioUiEngineP7QObject @ 195 NONAME
- _ZN23RadioStationFilterModelC2ER13RadioUiEngineP7QObject @ 196 NONAME
- _ZN23RadioStationFilterModelD0Ev @ 197 NONAME
- _ZN23RadioStationFilterModelD1Ev @ 198 NONAME
- _ZN23RadioStationFilterModelD2Ev @ 199 NONAME
- _ZNK12RadioStation10hasChangedEv @ 200 NONAME
- _ZNK12RadioStation10isDetachedEv @ 201 NONAME
- _ZNK12RadioStation10isFavoriteEv @ 202 NONAME
- _ZNK12RadioStation11changeFlagsEv @ 203 NONAME
- _ZNK12RadioStation11presetIndexEv @ 204 NONAME
- _ZNK12RadioStation12frequencyMhzEv @ 205 NONAME
- _ZNK12RadioStation13dynamicPsTextEv @ 206 NONAME
- _ZNK12RadioStation14hasDataChangedE6QFlagsINS_10ChangeFlagEE @ 207 NONAME
- _ZNK12RadioStation3urlEv @ 208 NONAME
- _ZNK12RadioStation4nameEv @ 209 NONAME
- _ZNK12RadioStation5genreEv @ 210 NONAME
- _ZNK12RadioStation6hasRdsEv @ 211 NONAME
- _ZNK12RadioStation6isTypeE6QFlagsINS_8TypeFlagEE @ 212 NONAME
- _ZNK12RadioStation6psTypeEv @ 213 NONAME
- _ZNK12RadioStation7isValidEv @ 214 NONAME
- _ZNK12RadioStation9frequencyEv @ 215 NONAME
- _ZNK12RadioStation9hasPiCodeEv @ 216 NONAME
- _ZNK12RadioStation9isRenamedEv @ 217 NONAME
- _ZNK12RadioStation9radioTextEv @ 218 NONAME
- _ZNK13RadioUiEngine10isScanningEv @ 219 NONAME
- _ZNK13RadioUiEngine10metaObjectEv @ 220 NONAME
- _ZNK13RadioUiEngine12maxFrequencyEv @ 221 NONAME
- _ZNK13RadioUiEngine12minFrequencyEv @ 222 NONAME
- _ZNK13RadioUiEngine13isInitializedEv @ 223 NONAME
- _ZNK13RadioUiEngine16currentFrequencyEv @ 224 NONAME
- _ZNK13RadioUiEngine17frequencyStepSizeEv @ 225 NONAME
- _ZNK13RadioUiEngine17isAntennaAttachedEv @ 226 NONAME
- _ZNK13RadioUiEngine18isUsingLoudspeakerEv @ 227 NONAME
- _ZNK13RadioUiEngine6regionEv @ 228 NONAME
- _ZNK13RadioUiEngine7isMutedEv @ 229 NONAME
- _ZNK13RadioUiEngine9isRadioOnEv @ 230 NONAME
- _ZNK16RadioHistoryItem10isDetachedEv @ 231 NONAME
- _ZNK16RadioHistoryItem17isRecognizedByRdsEv @ 232 NONAME
- _ZNK16RadioHistoryItem2idEv @ 233 NONAME
- _ZNK16RadioHistoryItem4timeEv @ 234 NONAME
- _ZNK16RadioHistoryItem5titleEv @ 235 NONAME
- _ZNK16RadioHistoryItem6artistEv @ 236 NONAME
- _ZNK16RadioHistoryItem7isValidEv @ 237 NONAME
- _ZNK16RadioHistoryItem7stationEv @ 238 NONAME
- _ZNK16RadioHistoryItem8isTaggedEv @ 239 NONAME
- _ZNK16RadioHistoryItem9frequencyEv @ 240 NONAME
- _ZNK17RadioHistoryModel10metaObjectEv @ 241 NONAME
- _ZNK17RadioHistoryModel11itemAtIndexERK11QModelIndex @ 242 NONAME
- _ZNK17RadioHistoryModel23isCurrentSongRecognizedEv @ 243 NONAME
- _ZNK17RadioHistoryModel4dataERK11QModelIndexi @ 244 NONAME
- _ZNK17RadioHistoryModel8rowCountERK11QModelIndex @ 245 NONAME
- _ZNK17RadioStationModel10metaObjectEv @ 246 NONAME
- _ZNK17RadioStationModel14currentStationEv @ 247 NONAME
- _ZNK17RadioStationModel4dataERK11QModelIndexi @ 248 NONAME
- _ZNK17RadioStationModel4listEv @ 249 NONAME
- _ZNK17RadioStationModel5flagsERK11QModelIndex @ 250 NONAME
- _ZNK17RadioStationModel8rowCountERK11QModelIndex @ 251 NONAME
- _ZNK17RadioStationModel9stationAtEi @ 252 NONAME
- _ZNK18RadioCarouselModel10metaObjectEv @ 253 NONAME
- _ZNK18RadioCarouselModel4dataERK11QModelIndexi @ 254 NONAME
- _ZNK18RadioCarouselModel8rowCountERK11QModelIndex @ 255 NONAME
- _ZNK18RadioScannerEngine10isScanningEv @ 256 NONAME
- _ZNK18RadioScannerEngine10metaObjectEv @ 257 NONAME
- _ZNK23RadioStationFilterModel16filterAcceptsRowEiRK11QModelIndex @ 258 NONAME
- _ZNK23RadioStationFilterModel4dataERK11QModelIndexi @ 259 NONAME
- _ZNK23RadioStationFilterModel5indexEiiRK11QModelIndex @ 260 NONAME
- _ZNK23RadioStationFilterModel7isEqualERK11QModelIndexS2_ @ 261 NONAME
- _ZNK23RadioStationFilterModel8rowCountERK11QModelIndex @ 262 NONAME
- _ZNK23RadioStationFilterModel9hasLoopedERK11QModelIndex @ 263 NONAME
- _ZNK23RadioStationFilterModel9realIndexERK11QModelIndex @ 264 NONAME
- _ZTI12RadioStation @ 265 NONAME
- _ZTI13RadioUiEngine @ 266 NONAME
- _ZTI16RadioHistoryItem @ 267 NONAME
- _ZTI17RadioHistoryModel @ 268 NONAME
- _ZTI17RadioStationModel @ 269 NONAME
- _ZTI18RadioCarouselModel @ 270 NONAME
- _ZTI18RadioScannerEngine @ 271 NONAME
- _ZTI23RadioStationFilterModel @ 272 NONAME
- _ZTV12RadioStation @ 273 NONAME
- _ZTV13RadioUiEngine @ 274 NONAME
- _ZTV16RadioHistoryItem @ 275 NONAME
- _ZTV17RadioHistoryModel @ 276 NONAME
- _ZTV17RadioStationModel @ 277 NONAME
- _ZTV18RadioCarouselModel @ 278 NONAME
- _ZTV18RadioScannerEngine @ 279 NONAME
- _ZTV23RadioStationFilterModel @ 280 NONAME
- _ZN13RadioUiEngine14openMusicStoreERK16RadioHistoryItemNS_10MusicStoreE @ 281 NONAME
-
--- a/radioapp/eabi/radiowidgetsu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
-EXPORTS
- _ZN11RadioWindow11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
- _ZN11RadioWindow11qt_metacastEPKc @ 2 NONAME
- _ZN11RadioWindow12activateViewER8QPointerI13RadioViewBaseERK7QString6QFlagsIN2Hb14ViewSwitchFlagEE @ 3 NONAME
- _ZN11RadioWindow15showVolumeLevelEi @ 4 NONAME
- _ZN11RadioWindow16activateMainViewEv @ 5 NONAME
- _ZN11RadioWindow16showErrorMessageERK7QString @ 6 NONAME
- _ZN11RadioWindow16staticMetaObjectE @ 7 NONAME DATA 16
- _ZN11RadioWindow17updateOrientationEN2Qt11OrientationE @ 8 NONAME
- _ZN11RadioWindow18orientationSectionEv @ 9 NONAME
- _ZN11RadioWindow19activateHistoryViewEv @ 10 NONAME
- _ZN11RadioWindow19getStaticMetaObjectEv @ 11 NONAME
- _ZN11RadioWindow19updateAntennaStatusEb @ 12 NONAME
- _ZN11RadioWindow20activateStationsViewEv @ 13 NONAME
- _ZN11RadioWindow4initEv @ 14 NONAME
- _ZN11RadioWindow8initViewEv @ 15 NONAME
- _ZN11RadioWindow8uiEngineEv @ 16 NONAME
- _ZN11RadioWindowC1EP7QWidget @ 17 NONAME
- _ZN11RadioWindowC2EP7QWidget @ 18 NONAME
- _ZN11RadioWindowD0Ev @ 19 NONAME
- _ZN11RadioWindowD1Ev @ 20 NONAME
- _ZN11RadioWindowD2Ev @ 21 NONAME
- _ZN13RadioMainView11qt_metacallEN11QMetaObject4CallEiPPv @ 22 NONAME
- _ZN13RadioMainView11qt_metacastEPKc @ 23 NONAME
- _ZN13RadioMainView14seekingStartedEv @ 24 NONAME
- _ZN13RadioMainView14setOrientationEv @ 25 NONAME
- _ZN13RadioMainView14toggleScanningEv @ 26 NONAME
- _ZN13RadioMainView15setScanningModeEb @ 27 NONAME
- _ZN13RadioMainView16staticMetaObjectE @ 28 NONAME DATA 16
- _ZN13RadioMainView16updateAudioRouteEb @ 29 NONAME
- _ZN13RadioMainView19getStaticMetaObjectEv @ 30 NONAME
- _ZN13RadioMainView22setFrequencyFromEngineEji @ 31 NONAME
- _ZN13RadioMainView22setFrequencyFromWidgetEji @ 32 NONAME
- _ZN13RadioMainView4initEv @ 33 NONAME
- _ZN13RadioMainView4skipEi @ 34 NONAME
- _ZN13RadioMainViewC1Ev @ 35 NONAME
- _ZN13RadioMainViewC2Ev @ 36 NONAME
- _ZN13RadioMainViewD0Ev @ 37 NONAME
- _ZN13RadioMainViewD1Ev @ 38 NONAME
- _ZN13RadioMainViewD2Ev @ 39 NONAME
- _ZN16RadioBannerLabel11qt_metacallEN11QMetaObject4CallEiPPv @ 40 NONAME
- _ZN16RadioBannerLabel11qt_metacastEPKc @ 41 NONAME
- _ZN16RadioBannerLabel16staticMetaObjectE @ 42 NONAME DATA 16
- _ZN16RadioBannerLabel19getStaticMetaObjectEv @ 43 NONAME
- _ZN16RadioBannerLabel5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 44 NONAME
- _ZN16RadioBannerLabelC1EP13QGraphicsItem @ 45 NONAME
- _ZN16RadioBannerLabelC2EP13QGraphicsItem @ 46 NONAME
- _ZN16RadioFadingLabel11qt_metacallEN11QMetaObject4CallEiPPv @ 47 NONAME
- _ZN16RadioFadingLabel11qt_metacastEPKc @ 48 NONAME
- _ZN16RadioFadingLabel11startEffectERK7QStringPKc @ 49 NONAME
- _ZN16RadioFadingLabel14effectFinishedEN8HbEffect12EffectStatusE @ 50 NONAME
- _ZN16RadioFadingLabel16setFadingEnabledEb @ 51 NONAME
- _ZN16RadioFadingLabel16staticMetaObjectE @ 52 NONAME DATA 16
- _ZN16RadioFadingLabel19getStaticMetaObjectEv @ 53 NONAME
- _ZN16RadioFadingLabel20setTextWithoutFadingERK7QString @ 54 NONAME
- _ZN16RadioFadingLabel7setTextERK7QString @ 55 NONAME
- _ZN16RadioFadingLabel8trimHtmlERK7QString @ 56 NONAME
- _ZN16RadioFadingLabelC1EP13QGraphicsItem @ 57 NONAME
- _ZN16RadioFadingLabelC2EP13QGraphicsItem @ 58 NONAME
- _ZN16RadioHistoryView10addOneSongEv @ 59 NONAME
- _ZN16RadioHistoryView11qt_metacallEN11QMetaObject4CallEiPPv @ 60 NONAME
- _ZN16RadioHistoryView11qt_metacastEPKc @ 61 NONAME
- _ZN16RadioHistoryView12openOviStoreEv @ 62 NONAME
- _ZN16RadioHistoryView13setTaggedIconERK6HbIcon @ 63 NONAME
- _ZN16RadioHistoryView13toggleTaggingEv @ 64 NONAME
- _ZN16RadioHistoryView14openOtherStoreEv @ 65 NONAME
- _ZN16RadioHistoryView14setOrientationEv @ 66 NONAME
- _ZN16RadioHistoryView15showContextMenuERK11QModelIndex @ 67 NONAME
- _ZN16RadioHistoryView16setNonTaggedIconERK6HbIcon @ 68 NONAME
- _ZN16RadioHistoryView16staticMetaObjectE @ 69 NONAME DATA 16
- _ZN16RadioHistoryView17deckButtonPressedEv @ 70 NONAME
- _ZN16RadioHistoryView18updateVisibilitiesEv @ 71 NONAME
- _ZN16RadioHistoryView19getStaticMetaObjectEv @ 72 NONAME
- _ZN16RadioHistoryView4initEv @ 73 NONAME
- _ZN16RadioHistoryView8addSongsEv @ 74 NONAME
- _ZN16RadioHistoryView9clearListEv @ 75 NONAME
- _ZN16RadioHistoryViewC1Ev @ 76 NONAME
- _ZN16RadioHistoryViewC2Ev @ 77 NONAME
- _ZN16RadioHistoryViewD0Ev @ 78 NONAME
- _ZN16RadioHistoryViewD1Ev @ 79 NONAME
- _ZN16RadioHistoryViewD2Ev @ 80 NONAME
- _ZN17RadioStationsView11qt_metacallEN11QMetaObject4CallEiPPv @ 81 NONAME
- _ZN17RadioStationsView11qt_metacastEPKc @ 82 NONAME
- _ZN17RadioStationsView12initListViewEv @ 83 NONAME
- _ZN17RadioStationsView13deleteStationEv @ 84 NONAME
- _ZN17RadioStationsView13startScanningEv @ 85 NONAME
- _ZN17RadioStationsView14finishScanningEv @ 86 NONAME
- _ZN17RadioStationsView14toggleFavoriteEv @ 87 NONAME
- _ZN17RadioStationsView15listItemClickedERK11QModelIndex @ 88 NONAME
- _ZN17RadioStationsView15setFavoriteIconERK6HbIcon @ 89 NONAME
- _ZN17RadioStationsView16staticMetaObjectE @ 90 NONAME DATA 16
- _ZN17RadioStationsView17deckButtonPressedEv @ 91 NONAME
- _ZN17RadioStationsView17setNowPlayingIconERK6HbIcon @ 92 NONAME
- _ZN17RadioStationsView19getStaticMetaObjectEv @ 93 NONAME
- _ZN17RadioStationsView19listItemLongPressedEP18HbAbstractViewItemRK7QPointF @ 94 NONAME
- _ZN17RadioStationsView19updateAntennaStatusEb @ 95 NONAME
- _ZN17RadioStationsView20updateCurrentStationEv @ 96 NONAME
- _ZN17RadioStationsView25updateControlVisibilitiesEv @ 97 NONAME
- _ZN17RadioStationsView4initEv @ 98 NONAME
- _ZN17RadioStationsView6renameEv @ 99 NONAME
- _ZN17RadioStationsView9clearListEv @ 100 NONAME
- _ZN17RadioStationsView9showEventEP10QShowEvent @ 101 NONAME
- _ZN17RadioStationsViewC1Ev @ 102 NONAME
- _ZN17RadioStationsViewC2Ev @ 103 NONAME
- _ZN17RadioStationsViewD0Ev @ 104 NONAME
- _ZN17RadioStationsViewD1Ev @ 105 NONAME
- _ZN17RadioStationsViewD2Ev @ 106 NONAME
- _ZN19RadioFrequencyStrip10drawPixmapEj5QListI12RadioStationEP18RadioFrequencyItem @ 107 NONAME
- _ZN19RadioFrequencyStrip11changeEventEP6QEvent @ 108 NONAME
- _ZN19RadioFrequencyStrip11hideButtonsEv @ 109 NONAME
- _ZN19RadioFrequencyStrip11initButtonsEv @ 110 NONAME
- _ZN19RadioFrequencyStrip11qt_metacallEN11QMetaObject4CallEiPPv @ 111 NONAME
- _ZN19RadioFrequencyStrip11qt_metacastEPKc @ 112 NONAME
- _ZN19RadioFrequencyStrip11resizeEventEP25QGraphicsSceneResizeEvent @ 113 NONAME
- _ZN19RadioFrequencyStrip11showButtonsEv @ 114 NONAME
- _ZN19RadioFrequencyStrip11updateItemsEv @ 115 NONAME
- _ZN19RadioFrequencyStrip12gestureEventEP13QGestureEvent @ 116 NONAME
- _ZN19RadioFrequencyStrip12initSelectorEv @ 117 NONAME
- _ZN19RadioFrequencyStrip12setFrequencyEji @ 118 NONAME
- _ZN19RadioFrequencyStrip13initPositionsEv @ 119 NONAME
- _ZN19RadioFrequencyStrip13seekRequestedEi @ 120 NONAME
- _ZN19RadioFrequencyStrip13skipRequestedEi @ 121 NONAME
- _ZN19RadioFrequencyStrip13toggleButtonsEv @ 122 NONAME
- _ZN19RadioFrequencyStrip13updateStationERK11QModelIndexii @ 123 NONAME
- _ZN19RadioFrequencyStrip14initEmptyItemsEv @ 124 NONAME
- _ZN19RadioFrequencyStrip14updateFavoriteERK12RadioStation @ 125 NONAME
- _ZN19RadioFrequencyStrip15addFrequencyPosEijP18RadioFrequencyItem @ 126 NONAME
- _ZN19RadioFrequencyStrip15checkIllegalPosEv @ 127 NONAME
- _ZN19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 128 NONAME
- _ZN19RadioFrequencyStrip15setScanningModeEb @ 129 NONAME
- _ZN19RadioFrequencyStrip15updateFavoritesEP18RadioFrequencyItem @ 130 NONAME
- _ZN19RadioFrequencyStrip16frequencyChangedEji @ 131 NONAME
- _ZN19RadioFrequencyStrip16handleLeftButtonEv @ 132 NONAME
- _ZN19RadioFrequencyStrip16scrollPosChangedE7QPointF @ 133 NONAME
- _ZN19RadioFrequencyStrip16staticMetaObjectE @ 134 NONAME DATA 16
- _ZN19RadioFrequencyStrip17handleRightButtonEv @ 135 NONAME
- _ZN19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 136 NONAME
- _ZN19RadioFrequencyStrip17scrollToFrequencyEji @ 137 NONAME
- _ZN19RadioFrequencyStrip17setLeftButtonIconERK6HbIcon @ 138 NONAME
- _ZN19RadioFrequencyStrip18setRightButtonIconERK6HbIcon @ 139 NONAME
- _ZN19RadioFrequencyStrip19createItemPrimitiveEP13QGraphicsItem @ 140 NONAME
- _ZN19RadioFrequencyStrip19getStaticMetaObjectEv @ 141 NONAME
- _ZN19RadioFrequencyStrip19updateItemPrimitiveEP13QGraphicsItemi @ 142 NONAME
- _ZN19RadioFrequencyStrip20emitFrequencyChangedEj @ 143 NONAME
- _ZN19RadioFrequencyStrip20handleLongLeftButtonEv @ 144 NONAME
- _ZN19RadioFrequencyStrip21handleLongRightButtonEv @ 145 NONAME
- _ZN19RadioFrequencyStrip4initEP13RadioUiEngine @ 146 NONAME
- _ZN19RadioFrequencyStrip9initModelEv @ 147 NONAME
- _ZN19RadioFrequencyStrip9showEventEP10QShowEvent @ 148 NONAME
- _ZN19RadioFrequencyStripC1Ev @ 149 NONAME
- _ZN19RadioFrequencyStripC2Ev @ 150 NONAME
- _ZN20RadioStationCarousel10timerFiredEv @ 151 NONAME
- _ZN20RadioStationCarousel11qt_metacallEN11QMetaObject4CallEiPPv @ 152 NONAME
- _ZN20RadioStationCarousel11qt_metacastEPKc @ 153 NONAME
- _ZN20RadioStationCarousel11setInfoTextEN16CarouselInfoText4TypeE @ 154 NONAME
- _ZN20RadioStationCarousel12cleanRdsDataEv @ 155 NONAME
- _ZN20RadioStationCarousel12gestureEventEP13QGestureEvent @ 156 NONAME
- _ZN20RadioStationCarousel12setFrequencyEji @ 157 NONAME
- _ZN20RadioStationCarousel13clearInfoTextEv @ 158 NONAME
- _ZN20RadioStationCarousel13scrollToIndexERK11QModelIndex6QFlagsINS_10ScrollFlagEE @ 159 NONAME
- _ZN20RadioStationCarousel14setItemVisibleEb @ 160 NONAME
- _ZN20RadioStationCarousel15insertFrequencyERK11QModelIndexii @ 161 NONAME
- _ZN20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 162 NONAME
- _ZN20RadioStationCarousel15openContextMenuEP18HbAbstractViewItemRK7QPointF @ 163 NONAME
- _ZN20RadioStationCarousel15removeFrequencyERK11QModelIndexii @ 164 NONAME
- _ZN20RadioStationCarousel15setFavoriteIconERK6HbIcon @ 165 NONAME
- _ZN20RadioStationCarousel15setScanningModeEb @ 166 NONAME
- _ZN20RadioStationCarousel15updateRadioTextERK12RadioStation @ 167 NONAME
- _ZN20RadioStationCarousel16frequencyChangedEji @ 168 NONAME
- _ZN20RadioStationCarousel16setCarouselModelEP18RadioCarouselModel @ 169 NONAME
- _ZN20RadioStationCarousel16staticMetaObjectE @ 170 NONAME DATA 16
- _ZN20RadioStationCarousel17animateNewStationERK12RadioStation @ 171 NONAME
- _ZN20RadioStationCarousel17setAutoScrollTimeEi @ 172 NONAME
- _ZN20RadioStationCarousel17updateCurrentItemEv @ 173 NONAME
- _ZN20RadioStationCarousel17updateFrequenciesEv @ 174 NONAME
- _ZN20RadioStationCarousel18currentStationItemEv @ 175 NONAME
- _ZN20RadioStationCarousel18setNonFavoriteIconERK6HbIcon @ 176 NONAME
- _ZN20RadioStationCarousel19getStaticMetaObjectEv @ 177 NONAME
- _ZN20RadioStationCarousel19updateAntennaStatusEb @ 178 NONAME
- _ZN20RadioStationCarousel19updateClampingStyleEv @ 179 NONAME
- _ZN20RadioStationCarousel21scanAnimationFinishedEv @ 180 NONAME
- _ZN20RadioStationCarousel22initCurrentStationItemEv @ 181 NONAME
- _ZN20RadioStationCarousel24initToLastTunedFrequencyEv @ 182 NONAME
- _ZN20RadioStationCarousel24prepareToRemoveFrequencyERK11QModelIndexii @ 183 NONAME
- _ZN20RadioStationCarousel4initER13RadioUiLoaderP13RadioUiEngine @ 184 NONAME
- _ZN20RadioStationCarousel4skipEN11StationSkip4ModeE @ 185 NONAME
- _ZN20RadioStationCarousel6updateERK12RadioStation @ 186 NONAME
- _ZN20RadioStationCarousel8uiEngineEv @ 187 NONAME
- _ZN20RadioStationCarousel9updatePosEi @ 188 NONAME
- _ZN20RadioStationCarouselC1EP13RadioUiEngine @ 189 NONAME
- _ZN20RadioStationCarouselC2EP13RadioUiEngine @ 190 NONAME
- _ZNK11RadioWindow10metaObjectEv @ 191 NONAME
- _ZNK13RadioMainView10metaObjectEv @ 192 NONAME
- _ZNK16RadioBannerLabel10metaObjectEv @ 193 NONAME
- _ZNK16RadioFadingLabel10metaObjectEv @ 194 NONAME
- _ZNK16RadioHistoryView10metaObjectEv @ 195 NONAME
- _ZNK16RadioHistoryView10taggedIconEv @ 196 NONAME
- _ZNK16RadioHistoryView12historyModelEv @ 197 NONAME
- _ZNK16RadioHistoryView13nonTaggedIconEv @ 198 NONAME
- _ZNK17RadioStationsView10metaObjectEv @ 199 NONAME
- _ZNK17RadioStationsView12favoriteIconEv @ 200 NONAME
- _ZNK17RadioStationsView14nowPlayingIconEv @ 201 NONAME
- _ZNK19RadioFrequencyStrip10metaObjectEv @ 202 NONAME
- _ZNK19RadioFrequencyStrip11selectorPosEv @ 203 NONAME
- _ZNK19RadioFrequencyStrip14leftButtonIconEv @ 204 NONAME
- _ZNK19RadioFrequencyStrip15rightButtonIconEv @ 205 NONAME
- _ZNK19RadioFrequencyStrip9frequencyEv @ 206 NONAME
- _ZNK20RadioStationCarousel10metaObjectEv @ 207 NONAME
- _ZNK20RadioStationCarousel12favoriteIconEv @ 208 NONAME
- _ZNK20RadioStationCarousel13carouselModelEv @ 209 NONAME
- _ZNK20RadioStationCarousel14autoScrollTimeEv @ 210 NONAME
- _ZNK20RadioStationCarousel15nonFavoriteIconEv @ 211 NONAME
- _ZNK20RadioStationCarousel16isInScanningModeEv @ 212 NONAME
- _ZNK20RadioStationCarousel17isAntennaAttachedEv @ 213 NONAME
- _ZTI11RadioWindow @ 214 NONAME
- _ZTI13RadioMainView @ 215 NONAME
- _ZTI16RadioBannerLabel @ 216 NONAME
- _ZTI16RadioFadingLabel @ 217 NONAME
- _ZTI16RadioHistoryView @ 218 NONAME
- _ZTI17RadioStationsView @ 219 NONAME
- _ZTI19RadioFrequencyStrip @ 220 NONAME
- _ZTI20RadioStationCarousel @ 221 NONAME
- _ZTV11RadioWindow @ 222 NONAME
- _ZTV13RadioMainView @ 223 NONAME
- _ZTV16RadioBannerLabel @ 224 NONAME
- _ZTV16RadioFadingLabel @ 225 NONAME
- _ZTV16RadioHistoryView @ 226 NONAME
- _ZTV17RadioStationsView @ 227 NONAME
- _ZTV19RadioFrequencyStrip @ 228 NONAME
- _ZTV20RadioStationCarousel @ 229 NONAME
- _ZThn16_N13RadioMainViewD0Ev @ 230 NONAME
- _ZThn16_N13RadioMainViewD1Ev @ 231 NONAME
- _ZThn16_N16RadioHistoryViewD0Ev @ 232 NONAME
- _ZThn16_N16RadioHistoryViewD1Ev @ 233 NONAME
- _ZThn16_N17RadioStationsViewD0Ev @ 234 NONAME
- _ZThn16_N17RadioStationsViewD1Ev @ 235 NONAME
- _ZThn8_N11RadioWindowD0Ev @ 236 NONAME
- _ZThn8_N11RadioWindowD1Ev @ 237 NONAME
- _ZThn8_N13RadioMainViewD0Ev @ 238 NONAME
- _ZThn8_N13RadioMainViewD1Ev @ 239 NONAME
- _ZThn8_N16RadioBannerLabel5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 240 NONAME
- _ZThn8_N16RadioHistoryViewD0Ev @ 241 NONAME
- _ZThn8_N16RadioHistoryViewD1Ev @ 242 NONAME
- _ZThn8_N17RadioStationsViewD0Ev @ 243 NONAME
- _ZThn8_N17RadioStationsViewD1Ev @ 244 NONAME
- _ZThn8_N19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 245 NONAME
- _ZThn8_N19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 246 NONAME
- _ZThn8_N20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 247 NONAME
- _ZN13RadioMainView12userAcceptedEv @ 248 NONAME
- _ZN16RadioHistoryView12userAcceptedEv @ 249 NONAME
- _ZN17RadioStationsView10renameDoneEP8HbAction @ 250 NONAME
- _ZN17RadioStationsView12userAcceptedEv @ 251 NONAME
-
--- a/radioapp/radioapplication/radioapplication.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioapplication/radioapplication.pro Fri Jun 11 13:38:32 2010 +0300
@@ -17,34 +17,37 @@
include(../buildflags.pri)
TEMPLATE = app
-TARGET = qtfmradio
+TARGET = fmradio
TRANSLATIONS += fmradio.ts
+ICON = resources/qtg_large_radio.svg
+#ICON = qtg_large_radio.svg
symbian: {
TARGET.CAPABILITY = CAP_APPLICATION MultimediaDD
- TARGET.VID = VID_DEFAULT
- TARGET.UID3 = 0x101FF976 # Old visual radio uid
+ TARGET.UID3 = 0x2002FF4E
TARGET.EPOCSTACKSIZE = 0x14000
TARGET.EPOCHEAPSIZE = 0x020000 0x2400000
}
CONFIG += hb service
+CONFIG += mobility
+MOBILITY = systeminfo
# Service provider specific configuration.
SERVICE.FILE = resources/service_conf.xml
INCLUDEPATH += . inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
INCLUDEPATH += ../radiouiengine/inc
INCLUDEPATH += ../radiowidgets/inc
-LIBS += -lradiouiengine
-LIBS += -lradiowidgets
+LIBS += -lfmradiouiengine
+LIBS += -lfmradiowidgets
# UI does not normally depend on the wrapper, but it does on two special cases
# 1. Logging is enabled. The logger is in the wrapper module
# 2. Radio is built for win32 target. The test window needs to access the wrapper
-LOGGING_ENABLED:LIBS += -lradioenginewrapper
+LOGGING_ENABLED:LIBS += -lfmradioenginewrapper
# Sources
HEADERS += radioapplication.h
@@ -54,7 +57,7 @@
# Win32 specific stuff
win32: {
- LIBS += -lradioenginewrapper
+ LIBS += -lfmradioenginewrapper
HEADERS += testwindow_win32.h
--- a/radioapp/radioapplication/resources/compile_ts.bat Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioapplication/resources/compile_ts.bat Fri Jun 11 13:38:32 2010 +0300
@@ -1,18 +1,3 @@
-@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-@rem All rights reserved.
-@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
-@rem which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description:
-@rem
@echo off
set QM_FILE_US=fmradio_en_US.qm
--- a/radioapp/radioapplication/resources/fmradio.ts Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioapplication/resources/fmradio.ts Fri Jun 11 13:38:32 2010 +0300
@@ -72,16 +72,6 @@
<extra-loc-feature>co</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_alarm_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Alarm</source>
- <translation variants="no">Alarm</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_news">
<comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 1.</comment>
<source>News</source>
@@ -102,16 +92,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_light_classical_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Light classical</source>
- <translation variants="no">Light classical</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_culture">
<comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 7.</comment>
<source>Culture</source>
@@ -192,16 +172,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_religious_talk_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Religious talk</source>
- <translation variants="no">Religious talk</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_culture">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Culture</source>
@@ -262,26 +232,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_classical_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Classical</source>
- <translation variants="no">Classical</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_national_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>National Music</source>
- <translation variants="no">National Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_rhythm_and_blues">
<comment>Main view Information area item. Displayed if PTY is available. Used only in US region.</comment>
<source>Rhythm and blues</source>
@@ -312,26 +262,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_other_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Other Music</source>
- <translation variants="no">Other Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_religion_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Religion</source>
- <translation variants="no">Religion</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_nostalgia">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Nostalgia</source>
@@ -392,26 +322,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_documentary_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Documentary</source>
- <translation variants="no">Documentary</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_education_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Education</source>
- <translation variants="no">Education</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_national_music">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>National Music</source>
@@ -432,26 +342,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_pop_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Pop Music</source>
- <translation variants="no">Pop Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_list_l1_mhz">
- <comment>Text in a home screen widget information area. %L1 is the radio station's frequency.</comment>
- <source>%L1 Mhz</source>
- <translation variants="no">%L1 Mhz</translation>
- <extra-loc-layout_id>txt_rad_list_l1_mhz</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_weather">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Weather</source>
@@ -482,26 +372,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_culture_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Culture</source>
- <translation variants="no">Culture</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_finance_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Finance</source>
- <translation variants="no">Finance</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_religious_music">
<comment>Main view Information area item. Displayed if PTY is available. Used only in US region.</comment>
<source>Religious music</source>
@@ -552,12 +422,12 @@
<extra-loc-feature>co</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_social_affairs_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Social Affairs</source>
- <translation variants="no">Social Affairs</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
+<message numerus="no" id="txt_rad_info_station_list_is_full_please_remove_s">
+ <comment>Dialog text which is displayed if all found stations do not fit to the Stations list after doing a Search all stations function. Displayed also if user tries to mark station as favorite in main view or in stations view and there is not enough room for stations in the Stations list.</comment>
+ <source>Station list is full. Please remove some stations and try again.</source>
+ <translation variants="no">Station list is full. Please remove some stations and try again.</translation>
+ <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+ <extra-loc-viewid>rad</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
@@ -642,16 +512,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_alarm_test_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Alarm Test</source>
- <translation variants="no">Alarm Test</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_alarm">
<comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 31.</comment>
<source>Alarm</source>
@@ -774,16 +634,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_religious_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Religious music</source>
- <translation variants="no">Religious music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_delete_station">
<comment>Confirmation query for deleting a selected station.</comment>
<source>Delete station?</source>
@@ -804,16 +654,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_soft_rock_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Soft rock</source>
- <translation variants="no">Soft rock</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_menu_add_to_favourites">
<comment>Item specific menu item. Allows the user to add a local station to favourite stations list. Available only if the station item is not already in the favourites.</comment>
<source>Add to favourites</source>
@@ -834,16 +674,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_drama_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Drama</source>
- <translation variants="no">Drama</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_you_can_add_song_to_the_tagged_songs">
<comment>Info text in main pane area if Tagged songs list has no item (e.g. after the user has deleted all content from the list). Note that "tagged songs" must use the same localisation as txt_rad_button_tagged_songs. Recently played songs must be same as "Recently played songs" text must be the same as txt_rad_button_recently_played_songs..</comment>
<source>You can add song to the tagged songs list from Recently played songs or from main view if song is identified by FM Radio. </source>
@@ -924,16 +754,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_soft_rhythm_and_blues_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Soft rhythm and blues</source>
- <translation variants="no">Soft rhythm and blues</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_clear_all_stations_list">
<comment>Dialog text displayed when user is about to clear the all stations in All stations view.</comment>
<source>Clear All stations list?</source>
@@ -994,16 +814,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_country_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Country Music</source>
- <translation variants="no">Country Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_activate_radio_in_offline_mode">
<comment>Confirmation query which is displayed when the FM Radio is launched while the device is in offline mode.</comment>
<source>Activate Fm Radio in off-line mode?</source>
@@ -1034,16 +844,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_soft_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Soft</source>
- <translation variants="no">Soft</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_drama">
<comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 6.</comment>
<source>Drama</source>
@@ -1084,16 +884,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_phone_in_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Phone In</source>
- <translation variants="no">Phone In</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_list_searching_all_available_stations_ple">
<comment>Main pane Information area item. Displayed below the tuning animation during the first time startup.</comment>
<source>Searching all available stations. Please wait.</source>
@@ -1104,16 +894,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_leisure_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Leisure</source>
- <translation variants="no">Leisure</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_college">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>College</source>
@@ -1164,26 +944,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_news_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>News</source>
- <translation variants="no">News</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_list_fm_radio">
- <comment>Text in a home screen widget information area. Displayed when no station is tuned.</comment>
- <source>FM Radio</source>
- <translation variants="no">FM Radio</translation>
- <extra-loc-layout_id>txt_rad_list_fm_radio</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_pop_music">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Pop Music</source>
@@ -1194,16 +954,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_top_40_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Top 40</source>
- <translation variants="no">Top 40</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_public">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Public</source>
@@ -1214,16 +964,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_nostalgia_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Nostalgia</source>
- <translation variants="no">Nostalgia</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_fmradio_info_fm_radio_could_not_be_started">
<comment>Dialog text which is displayed if FM Radio cannot be started for e.g. very low system memory or other rare cases.</comment>
<source>FM Radio could not be started. </source>
@@ -1244,6 +984,16 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
+<message numerus="no" id="txt_fmradio_list_quick_access_for_fm_radio_in_your">
+ <comment>FM radio home screen widget description in application library</comment>
+ <source>Quick access for FM radio in your homescreen.</source>
+ <translation variants="no">Quick access for FM radio in your homescreen.</translation>
+ <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>
+ <extra-loc-viewid>fmradio</extra-loc-viewid>
+ <extra-loc-positionid>list</extra-loc-positionid>
+ <extra-loc-feature>fm</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
<message numerus="no" id="txt_short_caption_fm_radio">
<comment>Application menu item name in grid. Short caption.</comment>
<source>FM Radio</source>
@@ -1304,16 +1054,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_rock_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Rock Music</source>
- <translation variants="no">Rock Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dpophead_no_stations_found_try_searching">
<comment>Discreet popup heading text. Displayed when no stations were found after search all stations function has been finished.</comment>
<source>No stations found. Try searching stations by scrolling the frequency strip.</source>
@@ -1334,16 +1074,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_tsw_caption_fm_radio">
- <comment>Application name in Task switcher.</comment>
- <source>FM Radio</source>
- <translation variants="no">FM Radio</translation>
- <extra-loc-layout_id>txt_tsw_caption_fmradio</extra-loc-layout_id>
- <extra-loc-viewid>tsw_01</extra-loc-viewid>
- <extra-loc-positionid>caption</extra-loc-positionid>
- <extra-loc-feature>ts</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_subhead_play_history">
<comment>Heading text for the Play history view.</comment>
<source>Play history</source>
@@ -1354,16 +1084,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_oldies_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Oldies Music</source>
- <translation variants="no">Oldies Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_menu_remove_tag">
<comment>Item specific menu item. Allows the user to remove a song from the tagged songs list.</comment>
<source>Remove tag</source>
@@ -1374,26 +1094,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_sport_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Sport</source>
- <translation variants="no">Sport</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_classic_rock_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Classic rock</source>
- <translation variants="no">Classic rock</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_personality">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Personality</source>
@@ -1544,16 +1244,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_weather_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Weather</source>
- <translation variants="no">Weather</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_1_2">
<comment>Two row list item first row. Displays artist and song name. Only in landscape. %1 is the artist's name and %2 is the song name.</comment>
<source>%1 - %2</source>
@@ -1564,36 +1254,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_personality_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Personality</source>
- <translation variants="no">Personality</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_rhythm_and_blues_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Rhythm and blues</source>
- <translation variants="no">Rhythm and blues</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_information_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Information</source>
- <translation variants="no">Information</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_leisure">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Leisure</source>
@@ -1614,26 +1274,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_current_affairs_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Current affairs</source>
- <translation variants="no">Current affairs</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_childrens_programmes_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Children’s programmes</source>
- <translation variants="no">Children’s programmes</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_button_recently_played_songs">
<comment>Button text. Opens the Recently played songs list view.</comment>
<source>Recently played songs</source>
@@ -1724,16 +1364,6 @@
<extra-loc-feature>co</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_easy_listening_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Easy Listening</source>
- <translation variants="no">Easy Listening</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_adult_hits">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Adult hits</source>
@@ -1754,26 +1384,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_public_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Public</source>
- <translation variants="no">Public</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_varied_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Varied</source>
- <translation variants="no">Varied</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_menu_search_from_music_store">
<comment>Item specific menu item. Allows the user to search the song/artist from Nokia Music Store</comment>
<source>Search from Ovi Music</source>
@@ -1794,26 +1404,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_science_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Science</source>
- <translation variants="no">Science</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_jazz_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Jazz Music</source>
- <translation variants="no">Jazz Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_documentary">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Documentary</source>
@@ -1834,16 +1424,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_folk_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Folk Music</source>
- <translation variants="no">Folk Music</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_list_l1_mhz_big">
<comment>Main pane information area item for the frequency. %L1 is the radio station's frequency. Displayed in big font. Displayed if station name is not available. Note that the "Mhz" text is displayed smaller than the actual frequency.</comment>
<source>%L1 MHz</source>
@@ -1914,26 +1494,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_adult_hits_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Adult hits</source>
- <translation variants="no">Adult hits</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_serious_classical_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Serious classical</source>
- <translation variants="no">Serious classical</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_documentary">
<comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 29.</comment>
<source>Documentary</source>
@@ -1944,16 +1504,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_college_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>College</source>
- <translation variants="no">College</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_button_tag_song">
<comment>A button text in main view. Adds the currently playing song to the Tagged songs list.</comment>
<source>Tag song</source>
@@ -1964,14 +1514,14 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_connect_wired_headset">
- <comment>Notification text which is displayed in home screen widget, when the headset antenna is not connected.</comment>
- <source>Connect wired headset.</source>
- <translation variants="no">Connect wired headset.</translation>
- <extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+<message numerus="no" id="txt_fmradio_list_fm_radio_homescreen_widget">
+ <comment>FM Radio home screen widget name in application library</comment>
+ <source>FM Radio homescreen widget</source>
+ <translation variants="no">FM Radio homescreen widget</translation>
+ <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>
+ <extra-loc-viewid>fmradio</extra-loc-viewid>
+ <extra-loc-positionid>list</extra-loc-positionid>
+ <extra-loc-feature>fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_fm_radio">
@@ -1994,6 +1544,16 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
+<message numerus="no" id="qtl_grid_taskswitcher_tiny">
+ <comment>Application name in Task switcher.</comment>
+ <source>FM Radio</source>
+ <translation variants="no">FM Radio</translation>
+ <extra-loc-layout_id>qtl_grid_taskswitcher_tiny</extra-loc-layout_id>
+ <extra-loc-viewid>tsw_01</extra-loc-viewid>
+ <extra-loc-positionid>caption</extra-loc-positionid>
+ <extra-loc-feature>ts</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
<message numerus="no" id="txt_rad_button_deactivate_loudspeaker">
<comment>A button text in main view. Displayed if volume is coming from the integrated loudspeaker. Activating the function routes audio to the headset.</comment>
<source>Deactivate loudspeaker</source>
@@ -2014,16 +1574,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_language_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Language</source>
- <translation variants="no">Language</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_button_search_all_stations">
<comment>A button text in main view. Starts the automatic frequency scanning for seeking all the available local stations</comment>
<source>Search all stations</source>
@@ -2094,16 +1644,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_talk_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Talk</source>
- <translation variants="no">Talk</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz">
<comment>First row of the the two row list item. %L1 is the frequency value of the station. Displayed only if the station does not have a name.</comment>
<source>%L1 MHz</source>
@@ -2154,16 +1694,6 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_info_travel_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Travel</source>
- <translation variants="no">Travel</translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_common_opt_activate_loudspeaker">
<comment>Options list item. Switches the audio from handset or handsfree to loudspeaker. Only available if audio can be routed to the loudspeaker.</comment>
<source>Activate loudspeaker</source>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioapplication/resources/qtg_large_radio.svg Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
+<stop offset="0" style="stop-color:#FF7236"/>
+<stop offset="0.7939" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#E8522A"/>
+</linearGradient>
+<path d="M58,50.776c0,0.858-0.697,1.556-1.557,1.556H3.555C2.694,52.332,2,51.635,2,50.776V13.443 c0-0.859,0.694-1.556,1.555-1.556h52.889c0.859,0,1.557,0.696,1.557,1.556V50.776z" fill="url(#SVGID_1_)"/>
+<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897 C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555 c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555 C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443 C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#D83506"/>
+<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889 c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#600909"/>
+<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556 h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="45.9424" x2="45.9424" y1="32.6411" y2="20.912">
+<stop offset="0" style="stop-color:#444243"/>
+<stop offset="1" style="stop-color:#231F20"/>
+</linearGradient>
+<circle cx="45.942" cy="26.611" fill="url(#SVGID_2_)" r="6.946"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="45.9424" x2="45.9424" y1="33.9702" y2="28.6358">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="1" style="stop-color:#413F3F"/>
+</linearGradient>
+<path d="M45.943,33.558c-3.754,0-6.803-2.979-6.935-6.698c-0.003,0.084-0.013,0.163-0.013,0.248 c0,3.836,3.109,6.946,6.947,6.946c3.836,0,6.945-3.11,6.945-6.946c0-0.085-0.01-0.164-0.01-0.248 C52.744,30.578,49.695,33.558,45.943,33.558z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9443" x2="45.9443" y1="35.3247" y2="17.436">
+<stop offset="0" style="stop-color:#FF4D00"/>
+<stop offset="1" style="stop-color:#9D1010"/>
+</linearGradient>
+<path d="M45.943,35.609c-4.933,0-8.944-4.013-8.944-8.943c0-4.933,4.012-8.945,8.944-8.945 s8.945,4.013,8.945,8.945C54.889,31.597,50.876,35.609,45.943,35.609L45.943,35.609z M45.943,18.888 c-4.29,0-7.778,3.488-7.778,7.778c0,4.287,3.488,7.776,7.778,7.776c4.287,0,7.779-3.489,7.779-7.776 C53.723,22.376,50.23,18.888,45.943,18.888L45.943,18.888z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="45.9434" x2="45.9434" y1="20.5371" y2="32.7461">
+<stop offset="0" style="stop-color:#CBCBCB"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<circle cx="45.943" cy="26.642" fill="url(#SVGID_5_)" r="6.104"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="45.9434" x2="45.9434" y1="20.9736" y2="32.3105">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.2848" style="stop-color:#FFFFFF"/>
+<stop offset="0.7212" style="stop-color:#7B7B7B"/>
+<stop offset="1" style="stop-color:#A7A7A7"/>
+</linearGradient>
+<circle cx="45.943" cy="26.642" fill="url(#SVGID_6_)" r="5.67"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="45.9434" x2="45.9434" y1="21.4746" y2="31.9404">
+<stop offset="0" style="stop-color:#D9D9D9"/>
+<stop offset="0.8242" style="stop-color:#636363"/>
+<stop offset="1" style="stop-color:#636363"/>
+</linearGradient>
+<path d="M50.705,24.468c0.303,0.662,0.471,1.396,0.471,2.174c0,2.889-2.342,5.233-5.232,5.233 c-2.888,0-5.232-2.345-5.232-5.233s2.345-5.232,5.232-5.232C48.058,21.409,49.879,22.663,50.705,24.468z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.9434" x2="45.9434" y1="25.4961" y2="22.9348">
+<stop offset="0" style="stop-color:#636363"/>
+<stop offset="1" style="stop-color:#323232"/>
+</linearGradient>
+<polygon fill="url(#SVGID_8_)" points="44.636,25.397 45.943,22.782 47.251,25.397 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="20.2773" x2="20.2773" y1="30.6846" y2="20.667">
+<stop offset="0" style="stop-color:#636363"/>
+<stop offset="0.6667" style="stop-color:#515151"/>
+<stop offset="1" style="stop-color:#323232"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="10.889" width="28" x="6.277" y="20.055"/>
+<rect fill="#D9D9D9" height="0.777" width="28" x="6.277" y="30.943"/>
+<polygon fill="#A6A8AB" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832 26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832 20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276 13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499 7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609 20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609 32.721,27.832 32.721,25.499 "/>
+<rect fill="#E00000" height="10.889" width="1.556" x="20.301" y="20.055"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="9.127" x2="9.127" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="9.127" cy="41.832" fill="url(#SVGID_10_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.126" x2="9.126" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="9.126" cy="41.832" fill="url(#SVGID_11_)" r="1.039"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7295" x2="13.7295" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<path d="M15.285,41.832c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556 c0-0.861,0.697-1.556,1.555-1.556C14.592,40.276,15.285,40.971,15.285,41.832z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.7295" x2="13.7295" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="13.73" cy="41.832" fill="url(#SVGID_13_)" r="1.038"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.3955" x2="18.3955" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="18.396" cy="41.832" fill="url(#SVGID_14_)" r="1.555"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.3955" x2="18.3955" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="18.396" cy="41.832" fill="url(#SVGID_15_)" r="1.038"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="23.0615" x2="23.0615" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="23.062" cy="41.832" fill="url(#SVGID_16_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.0635" x2="23.0635" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="23.063" cy="41.832" fill="url(#SVGID_17_)" r="1.038"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="27.7295" x2="27.7295" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="27.729" cy="41.832" fill="url(#SVGID_18_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="27.7295" x2="27.7295" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="27.729" cy="41.832" fill="url(#SVGID_19_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="32.3965" x2="32.3965" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="32.396" cy="41.832" fill="url(#SVGID_20_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="32.3965" x2="32.3965" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="32.396" cy="41.832" fill="url(#SVGID_21_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="9.127" x2="9.127" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="9.127" cy="46.499" fill="url(#SVGID_22_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="9.126" x2="9.126" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="9.126" cy="46.499" fill="url(#SVGID_23_)" r="1.039"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="13.7295" x2="13.7295" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<path d="M15.285,46.499c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556 c0-0.861,0.697-1.556,1.555-1.556C14.592,44.943,15.285,45.638,15.285,46.499z" fill="url(#SVGID_24_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="13.7295" x2="13.7295" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="13.73" cy="46.499" fill="url(#SVGID_25_)" r="1.038"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="18.3955" x2="18.3955" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="18.396" cy="46.499" fill="url(#SVGID_26_)" r="1.555"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="18.3955" x2="18.3955" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="18.396" cy="46.499" fill="url(#SVGID_27_)" r="1.038"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="23.0615" x2="23.0615" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="23.062" cy="46.499" fill="url(#SVGID_28_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="23.0635" x2="23.0635" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="23.063" cy="46.499" fill="url(#SVGID_29_)" r="1.038"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="27.7295" x2="27.7295" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="27.729" cy="46.499" fill="url(#SVGID_30_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="27.7295" x2="27.7295" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="27.729" cy="46.499" fill="url(#SVGID_31_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="32.3965" x2="32.3965" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="32.396" cy="46.499" fill="url(#SVGID_32_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="32.3965" x2="32.3965" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="32.396" cy="46.499" fill="url(#SVGID_33_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="36.999" x2="36.999" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="36.999" cy="41.832" fill="url(#SVGID_34_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="36.999" x2="36.999" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="36.999" cy="41.832" fill="url(#SVGID_35_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="41.666" x2="41.666" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="41.666" cy="41.832" fill="url(#SVGID_36_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="41.666" x2="41.666" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="41.666" cy="41.832" fill="url(#SVGID_37_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.333" x2="46.333" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="46.333" cy="41.832" fill="url(#SVGID_38_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="46.333" x2="46.333" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="46.333" cy="41.832" fill="url(#SVGID_39_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="50.999" x2="50.999" y1="40.2437" y2="43.355">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<path d="M52.553,41.832c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556 c0-0.861,0.697-1.556,1.556-1.556C51.861,40.276,52.553,40.971,52.553,41.832z" fill="url(#SVGID_40_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.999" x2="50.999" y1="40.7729" y2="42.8472">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<path d="M52.037,41.832c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037 s0.466-1.037,1.039-1.037C51.57,40.795,52.037,41.259,52.037,41.832z" fill="url(#SVGID_41_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="36.999" x2="36.999" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="36.999" cy="46.499" fill="url(#SVGID_42_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="36.999" x2="36.999" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="36.999" cy="46.499" fill="url(#SVGID_43_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="41.666" x2="41.666" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="41.666" cy="46.499" fill="url(#SVGID_44_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="41.666" x2="41.666" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="41.666" cy="46.499" fill="url(#SVGID_45_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="46.333" x2="46.333" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<circle cx="46.333" cy="46.499" fill="url(#SVGID_46_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="46.333" x2="46.333" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<circle cx="46.333" cy="46.499" fill="url(#SVGID_47_)" r="1.037"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="50.999" x2="50.999" y1="44.9106" y2="48.022">
+<stop offset="0" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#FF7236"/>
+</linearGradient>
+<path d="M52.553,46.499c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556 c0-0.861,0.697-1.556,1.556-1.556C51.861,44.943,52.553,45.638,52.553,46.499z" fill="url(#SVGID_48_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="50.999" x2="50.999" y1="45.4399" y2="47.5142">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#383838"/>
+</linearGradient>
+<path d="M52.037,46.499c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037 s0.466-1.037,1.039-1.037C51.57,45.462,52.037,45.926,52.037,46.499z" fill="url(#SVGID_49_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.833" x2="49.833" y1="11.5854" y2="6.285">
+<stop offset="0" style="stop-color:#CBCBCB"/>
+<stop offset="0.1576" style="stop-color:#808080"/>
+<stop offset="0.6545" style="stop-color:#E5E5E5"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_50_)" height="5.443" width="6.999" x="46.333" y="6.444"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="37.3877" x2="37.3877" y1="10.1592" y2="7.1295">
+<stop offset="0" style="stop-color:#CBCBCB"/>
+<stop offset="0.1576" style="stop-color:#808080"/>
+<stop offset="0.6545" style="stop-color:#E5E5E5"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_51_)" height="3.111" width="17.89" x="28.443" y="7.221"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="19.1104" x2="19.1104" y1="9.4683" y2="7.9534">
+<stop offset="0" style="stop-color:#CBCBCB"/>
+<stop offset="0.1576" style="stop-color:#808080"/>
+<stop offset="0.6545" style="stop-color:#E5E5E5"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_52_)" height="1.556" width="18.666" x="9.777" y="7.999"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="8.6104" x2="8.6104" y1="10.1592" y2="7.1295">
+<stop offset="0" style="stop-color:#CBCBCB"/>
+<stop offset="0.1576" style="stop-color:#808080"/>
+<stop offset="0.6545" style="stop-color:#E5E5E5"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_53_)" height="3.111" width="2.334" x="7.443" y="7.221"/>
+<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334 C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<circle cx="49.833" cy="9.166" fill-opacity="0.2" r="1.944" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="49.8311" x2="49.8311" y1="8.0317" y2="10.2999">
+<stop offset="0" style="stop-color:#E5E5E5"/>
+<stop offset="0.7576" style="stop-color:#A7A7A7"/>
+<stop offset="1" style="stop-color:#CBCBCB"/>
+</linearGradient>
+<circle cx="49.831" cy="9.166" fill="url(#SVGID_54_)" r="1.556"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="49.8311" x2="49.8311" y1="7.6592" y2="10.6737">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.2848" style="stop-color:#FFFFFF"/>
+<stop offset="0.7212" style="stop-color:#7B7B7B"/>
+<stop offset="1" style="stop-color:#A7A7A7"/>
+</linearGradient>
+<path d="M49.832,7.999C50.475,7.999,51,8.521,51,9.166c0,0.643-0.525,1.166-1.168,1.166 s-1.166-0.523-1.166-1.166C48.666,8.521,49.189,7.999,49.832,7.999 M49.832,7.61c-0.859,0-1.557,0.694-1.557,1.556 c0,0.858,0.697,1.556,1.557,1.556c0.857,0,1.555-0.697,1.555-1.556C51.387,8.305,50.689,7.61,49.832,7.61L49.832,7.61z" fill="url(#SVGID_55_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
--- a/radioapp/radioapplication/src/main.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioapplication/src/main.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -22,12 +22,6 @@
#include "radioapplication.h"
#include "radiologger.h"
-// Constants
-#ifdef BUILD_WIN32
- const char* TRANSLATIONS_FOLDER = "";
-#else
- const char* TRANSLATIONS_FOLDER = "/resource/qt/translations/";
-#endif // BUILD_WIN32
/*!
* Runs the application
@@ -40,7 +34,7 @@
RadioApplication app( argc, argv );
- HbTranslator translator( TRANSLATIONS_FOLDER, "fmradio" ); // TODO: Rename exe to fmradio.exe to get rid of this
+ HbTranslator translator;
const int returnValue = app.exec();
--- a/radioapp/radioapplication/src/radioapplication.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioapplication/src/radioapplication.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -17,6 +17,7 @@
// System includes
#include <QTimer>
+#include <qsysteminfo.h>
#include <HbDeviceMessageBox>
// User includes
@@ -71,13 +72,21 @@
*/
void RadioApplication::init()
{
- bool okToStart = !RadioUiEngine::isOfflineProfile();
+ // If started as a service, there is no need for offline-check
+ const Hb::ActivationReason reason = activateReason();
+ bool okToStart = reason == Hb::ActivationReasonService;
+ QScopedPointer<QtMobility::QSystemDeviceInfo> deviceInfo( new QtMobility::QSystemDeviceInfo() );
if ( !okToStart ) {
- HbDeviceMessageBox box( hbTrId( "txt_rad_info_activate_radio_in_offline_mode" ), HbMessageBox::MessageTypeQuestion );
- box.setTimeout( HbPopup::NoTimeout );
- box.exec();
- okToStart = box.isAcceptAction( box.triggeredAction() );
+ if ( deviceInfo->currentProfile() != QtMobility::QSystemDeviceInfo::OfflineProfile ) {
+ okToStart = true;
+ } else {
+ // Device is in offline profile, ask the user for permission to start
+ HbDeviceMessageBox box( hbTrId( "txt_rad_info_activate_radio_in_offline_mode" ), HbMessageBox::MessageTypeQuestion );
+ box.setTimeout( HbPopup::NoTimeout );
+ box.exec();
+ okToStart = box.isAcceptAction( box.triggeredAction() );
+ }
}
if ( okToStart ) {
@@ -92,7 +101,7 @@
INIT_WIN32_TEST_WINDOW
// Construct the real views
- mMainWindow->init();
+ mMainWindow->init( deviceInfo.take() );
mMainWindow->show();
} else {
--- a/radioapp/radioapplication/src/testwindow_win32.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioapplication/src/testwindow_win32.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -87,14 +87,14 @@
mThemeBox->setEditable( false );
initThemes();
- connectAndTest( mOrientationButton, SIGNAL(clicked()), this, SLOT(changeOrientation()) );
- connectAndTest( mVolUpButton, SIGNAL(clicked()), this, SLOT(volumeUp()) );
- connectAndTest( mVolDownButton, SIGNAL(clicked()), this, SLOT(volumeDown()) );
- connectAndTest( mHeadsetButton, SIGNAL(clicked()), this, SLOT(toggleHeadsetStatus()) );
- connectAndTest( mAddSongButton, SIGNAL(clicked()), this, SLOT(addSong()) );
- connectAndTest( mClearSongButton, SIGNAL(clicked()), this, SLOT(clearSong()) );
- connectAndTest( mOfflineButton, SIGNAL(clicked()), this, SLOT(toggleOffline()) );
- connectAndTest( mThemeBox, SIGNAL(activated(QString)), this, SLOT(changeTheme(QString)) );
+ Radio::connect( mOrientationButton, SIGNAL(clicked()), this, SLOT(changeOrientation()) );
+ Radio::connect( mVolUpButton, SIGNAL(clicked()), this, SLOT(volumeUp()) );
+ Radio::connect( mVolDownButton, SIGNAL(clicked()), this, SLOT(volumeDown()) );
+ Radio::connect( mHeadsetButton, SIGNAL(clicked()), this, SLOT(toggleHeadsetStatus()) );
+ Radio::connect( mAddSongButton, SIGNAL(clicked()), this, SLOT(addSong()) );
+ Radio::connect( mClearSongButton, SIGNAL(clicked()), this, SLOT(clearSong()) );
+ Radio::connect( mOfflineButton, SIGNAL(clicked()), this, SLOT(toggleOffline()) );
+ Radio::connect( mThemeBox, SIGNAL(activated(QString)), this, SLOT(changeTheme(QString)) );
QTimer::singleShot( 0, this, SLOT(updateWindowSize()) );
}
@@ -186,8 +186,8 @@
*/
void Win32Window::volumeUp()
{
- if ( ++mVolume > KMaximumVolumeLevel ) {
- mVolume = KMaximumVolumeLevel;
+ if ( ++mVolume > MAXIMUM_VOLUME_LEVEL ) {
+ mVolume = MAXIMUM_VOLUME_LEVEL;
}
RadioEngineWrapperPrivate::instance()->setVolume( mVolume );
}
--- a/radioapp/radioenginewrapper/inc/cradioenginehandler.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/cradioenginehandler.h Fri Jun 11 13:38:32 2010 +0300
@@ -53,28 +53,37 @@
void SetRdsObserver( MRadioRdsDataObserver* aObserver );
/**
+ * Starts or stops receiving RDS data
+ */
+ void SetRdsEnabled( TBool aRdsEnabled );
+
+ /**
* Returns the radio status
* @return ETrue = radio is on, EFalse = radio is off
*/
TBool IsRadioOn();
/**
+ * Sets the manual seek status
+ */
+ void SetManualSeekMode( TBool aManualSeek );
+
+ /**
+ * Returns the manual seek status
+ */
+ TBool IsInManualSeekMode() const;
+
+ /**
* Tune to the specified frequency
* @param aFrequency - frequency to lock onto.
*/
- void Tune( TUint aFrequency );
-
- /**
- * Tune to the specified frequency after a delay
- * @param aFrequency - frequency to lock onto.
- */
- void TuneWithDelay( TUint aFrequency );
+ void SetFrequency( TUint aFrequency );
/**
* Sets the audio mute state
* @param aMuted - flag to determine whether mute should be turned on or off
*/
- void SetMuted( const TBool aMuted );
+ void SetMuted( const TBool aMuted, const TBool aUpdateSettings = ETrue );
/**
* Gets the audio mute state
@@ -120,7 +129,7 @@
* Retrieves the current frequency.
* @return the frequency in hertz
*/
- TUint TunedFrequency() const;
+ TUint CurrentFrequency() const;
/**
* Returns the minimum allowed frequency in the current region
@@ -140,7 +149,7 @@
/**
* Scan up to the next available frequency.
*/
- void Seek( Seeking::Direction direction );
+ void Seek( Seek::Direction direction );
/**
* Cancel previously requested scan.
@@ -150,11 +159,7 @@
/**
* Returns the engine seeking state
*/
- Seeking::State SeekingState() const;
-
- void StartScan( MRadioScanObserver& aObserver );
-
- void StopScan( TInt aError = KErrCancel );
+ Seek::State SeekingState() const;
/**
* Rreturn step size for tuning.
@@ -181,17 +186,8 @@
TBool IsAudioRoutedToLoudspeaker() const;
/**
- * Returns ar reference to the publish & subscribe handler
+ * Returns a reference to the application settings
*/
- CRadioPubSub& PubSub();
-
- /**
- * Returns the repository manager.
- *
- * @return The repository manager.
- */
- CRadioRepositoryManager& Repository() const;
-
MRadioApplicationSettings& ApplicationSettings() const;
private:
@@ -201,16 +197,6 @@
CRadioAudioRouter* InitAudioRouterL();
CRadioSystemEventCollector* InitSystemEventCollectorL();
CRadioSettings* InitSettingsL();
- CRadioPubSub* InitPubSubL();
-
-// New functions
-
- /**
- * Static callback function to be used by the tune delay timer
- * @param aSelf Pointer to this
- * @return not used
- */
- static TInt TuneDelayCallback( TAny* aSelf );
private: // data
@@ -232,12 +218,6 @@
TUint iFrequency;
/**
- * Timer used for delayed tuning
- * Own.
- */
- CPeriodic* iDelayTimer;
-
- /**
* Selected radio region
*/
RadioRegion::Region iRegion;
--- a/radioapp/radioenginewrapper/inc/mradioenginehandlerobserver.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/mradioenginehandlerobserver.h Fri Jun 11 13:38:32 2010 +0300
@@ -22,13 +22,11 @@
#include "mradioengineobserver.h"
#include "mradioaudioroutingobserver.h"
#include "mradiosystemeventobserver.h"
-#include "mradiorepositoryentityobserver.h"
// Class declaration
NONSHARABLE_CLASS( MRadioEngineHandlerObserver ) : public MRadioEngineObserver
, public MRadioAudioRoutingObserver
, public MRadioSystemEventObserver
- , public MRadioRepositoryEntityObserver
{
public:
--- a/radioapp/radioenginewrapper/inc/radioenginewrapper.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper.h Fri Jun 11 13:38:32 2010 +0300
@@ -44,15 +44,12 @@
RadioEngineWrapper( RadioStationHandlerIf& stationHandler );
~RadioEngineWrapper();
+ bool init();
+
void addObserver( RadioEngineWrapperObserver* observer );
void removeObserver( RadioEngineWrapperObserver* observer );
/**
- * Checks if the radio engine has been constructed properly
- */
- bool isEngineConstructed();
-
- /**
* Getters for things owned by the engine
*/
RadioSettingsIf& settings();
@@ -64,7 +61,7 @@
uint minFrequency() const;
uint maxFrequency() const;
uint frequencyStepSize() const;
- bool isFrequencyValid( uint frequency );
+ bool isFrequencyValid( uint frequency ) const;
/**
* Getters for current radio status
@@ -75,20 +72,26 @@
bool isAntennaAttached() const;
bool isUsingLoudspeaker() const;
+ void setManualSeekMode( bool manualSeek );
+ bool isInManualSeekMode() const;
+
+ void setRdsEnabled( bool rdsEnabled );
+
/**
- * Functions to tune to given frequency or preset
+ * Tunes to the given frequency
*/
- void tuneFrequency( uint frequency, const int reason = TuneReason::Unspecified );
- void tuneWithDelay( uint frequency, const int reason = TuneReason::Unspecified );
+ void setFrequency( uint frequency, const int reason = TuneReason::Unspecified );
/*!
* Audio update command functions for the engine
*/
+ void increaseVolume();
+ void decreaseVolume();
void setVolume( int volume );
- void setMute( bool muted );
+ void setMute( bool muted, bool updateSettings = true );
void toggleAudioRoute();
- void startSeeking( Seeking::Direction direction, const int reason = TuneReason::Unspecified );
+ void startSeeking( Seek::Direction direction, const int reason = TuneReason::Unspecified );
void cancelSeeking();
private: // data
--- a/radioapp/radioenginewrapper/inc/radioenginewrapper_p.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper_p.h Fri Jun 11 13:38:32 2010 +0300
@@ -63,8 +63,7 @@
/**
* Initialization and startup
*/
- void init();
- bool isEngineConstructed();
+ bool init();
/**
* Returns the radio settings
@@ -78,14 +77,13 @@
CRadioEngineHandler& RadioEnginehandler();
/**
- * Functions called from slots to tune to given frequency or preset
+ * Tunes to given frequency
*/
- void tuneFrequency( uint frequency, const int reason );
- void tuneWithDelay( uint frequency, const int reason );
+ void setFrequency( uint frequency, const int reason );
ObserverList& observers();
- void startSeeking( Seeking::Direction direction, const int reason = TuneReason::Unspecified );
+ void startSeeking( Seek::Direction direction, const int reason = TuneReason::Unspecified );
private:
@@ -110,13 +108,6 @@
void HandleSystemEventL( TRadioSystemEventType aEventType );
-// from base class MRadioRepositoryEntityObserver
-
- void HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, TInt aValue, TInt aError );
- void HandleRepositoryValueChangeL( const TUid& /*aUid*/, TUint32 /*aKey*/, const TReal& /*aValue*/, TInt /*aError*/ ) {}
- void HandleRepositoryValueChangeL( const TUid& /*aUid*/, TUint32 /*aKey*/, const TDesC8& /*aValue*/, TInt /*aError*/ ) {}
- void HandleRepositoryValueChangeL( const TUid& /*aUid*/, TUint32 /*aKey*/, const TDesC16& /*aValue*/, TInt /*aError*/ ) {}
-
private: // data
/**
--- a/radioapp/radioenginewrapper/inc/radioenginewrapper_win32_p.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper_win32_p.h Fri Jun 11 13:38:32 2010 +0300
@@ -65,8 +65,7 @@
/**
* Initialization and startup
*/
- void init();
- bool isEngineConstructed();
+ bool init();
/**
* Returns the radio settings
@@ -74,14 +73,13 @@
RadioSettingsIf& settings();
/**
- * Functions called from slots to tune to given frequency or preset
+ * Tunes to the given frequency
*/
- void tuneFrequency( uint frequency, const int reason );
- void tuneWithDelay( uint frequency, const int reason );
+ void setFrequency( uint frequency, const int reason );
ObserverList& observers();
- void startSeeking( Seeking::Direction direction, const int reason );
+ void startSeeking( Seek::Direction direction, const int reason );
void cancelSeeking();
void toggleAudioRoute();
@@ -177,6 +175,8 @@
QString mArtist;
QString mTitle;
+ bool mManualSeekMode;
+
};
#endif // RADIOENGINEWRAPPER_P_H
--- a/radioapp/radioenginewrapper/inc/radioenginewrapperobserver.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapperobserver.h Fri Jun 11 13:38:32 2010 +0300
@@ -31,6 +31,8 @@
virtual void rdsAvailabilityChanged( bool available );
+ virtual void increaseVolume();
+ virtual void decreaseVolume();
virtual void volumeChanged( int volume );
virtual void muteChanged( bool muted );
--- a/radioapp/radioenginewrapper/inc/radioenummapper.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radioenummapper.h Fri Jun 11 13:38:32 2010 +0300
@@ -31,7 +31,7 @@
*/
#define BEGIN_ENUM_MAP(name) const RadioEnumMapper::EnumMap name[] = {
#define ENUM_MAP_ITEM(ui_enum, engine_enum ) { ui_enum, engine_enum }
-#define END_ENUM_MAP(name) }; const TInt name ## Count = sizeof ( name ) / sizeof ( name[0] );
+#define END_ENUM_MAP(name) }; const int name ## Count = sizeof ( name ) / sizeof ( name[0] );
/*!
* Convenience macros to do the mappings
--- a/radioapp/radioenginewrapper/inc/radiosettings.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radiosettings.h Fri Jun 11 13:38:32 2010 +0300
@@ -46,6 +46,7 @@
// from base class RadioSettingsIf
bool isFirstTimeStart();
+ void setFirstTimeStartPerformed( bool firstTimeStartPerformed );
bool showFavorites() const;
void setShowFavorites( bool showFavorites );
bool toggleShowFavorites();
--- a/radioapp/radioenginewrapper/inc/radiosettings_p.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radiosettings_p.h Fri Jun 11 13:38:32 2010 +0300
@@ -51,6 +51,7 @@
// First time start
bool isFirstTimeStart();
+ void setFirstTimeStartPerformed( bool firstTimeStartPerformed );
bool isFlagSet( ToggleFlag flag ) const;
void toggleFlag( ToggleFlag flag );
--- a/radioapp/radioenginewrapper/inc/radiosettingsif.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/inc/radiosettingsif.h Fri Jun 11 13:38:32 2010 +0300
@@ -25,6 +25,7 @@
// First time start
virtual bool isFirstTimeStart() = 0;
+ virtual void setFirstTimeStartPerformed( bool firstTimeStartPerformed ) = 0;
// Favorites
virtual bool showFavorites() const = 0;
--- a/radioapp/radioenginewrapper/radioenginewrapper.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/radioenginewrapper.pro Fri Jun 11 13:38:32 2010 +0300
@@ -17,14 +17,16 @@
include(../buildflags.pri)
TEMPLATE = lib
-TARGET = radioenginewrapper
+TARGET = fmradioenginewrapper
CONFIG += dll
DEFINES += BUILD_WRAPPER_DLL
+symbian:TARGET.UID3 = 0x2002EAD8
+
USE_DUMMY_RADIO_DATA:QT += xml
INCLUDEPATH += inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
# Common headers
HEADERS += radiowrapperexport.h
@@ -51,9 +53,9 @@
INCLUDEPATH += ../../radioengine/settings/api
INCLUDEPATH += ../../radioengine/engine/api
- LIBS *= -lradioengineutils
- LIBS *= -lradioenginesettings
- LIBS *= -lradioengine
+ LIBS *= -lfmradioengineutils
+ LIBS *= -lfmradioenginesettings
+ LIBS *= -lfmradioengine
HEADERS += cradioenginehandler.h
HEADERS += mradioenginehandlerobserver.h
--- a/radioapp/radioenginewrapper/src/cradioenginehandler.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/cradioenginehandler.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -21,7 +21,6 @@
#include "cradiosystemeventcollector.h"
#include "cradiosettings.h"
#include "mradioenginesettings.h"
-#include "cradiopubsub.h"
#include "cradiorepositorymanager.h"
#include "mradiordsreceiver.h"
#include "cradioenginehandler.h"
@@ -30,18 +29,13 @@
#include "radiologger.h"
#include "radioenummapper.h"
-/**
- * Delayed tuning delay
- */
-const TInt KTuneDelay = 100000;
-
/*!
* Map to translate seek direction enum from its definition in the engine to
* its definition in the ui and vice versa
*/
BEGIN_ENUM_MAP( KSeekDirectionMap )
- ENUM_MAP_ITEM( Seeking::Down, RadioEngine::ERadioDown ),
- ENUM_MAP_ITEM( Seeking::Up, RadioEngine::ERadioUp )
+ ENUM_MAP_ITEM( Seek::Down, RadioEngine::ERadioDown ),
+ ENUM_MAP_ITEM( Seek::Up, RadioEngine::ERadioUp )
END_ENUM_MAP( KSeekDirectionMap )
/*!
@@ -72,15 +66,15 @@
* its definition in the ui and vice versa
*/
BEGIN_ENUM_MAP( KSeekingStateMap )
- ENUM_MAP_ITEM( Seeking::NotSeeking, RadioEngine::ERadioNotSeeking ),
- ENUM_MAP_ITEM( Seeking::SeekingUp, RadioEngine::ERadioSeekingUp ),
- ENUM_MAP_ITEM( Seeking::SeekingDown, RadioEngine::ERadioSeekingDown )
+ ENUM_MAP_ITEM( Seek::NotSeeking, RadioEngine::ERadioNotSeeking ),
+ ENUM_MAP_ITEM( Seek::SeekingUp, RadioEngine::ERadioSeekingUp ),
+ ENUM_MAP_ITEM( Seek::SeekingDown, RadioEngine::ERadioSeekingDown )
END_ENUM_MAP( KSeekingStateMap )
/*!
* Convenience macro to do the mapping of seeking states
*/
-#define MAP_TO_UI_SEEKING_STATE(ui_enum) MAP_TO_UI_ENUM( Seeking::State, ui_enum, KSeekingStateMap )
+#define MAP_TO_UI_SEEKING_STATE(ui_enum) MAP_TO_UI_ENUM( Seek::State, ui_enum, KSeekingStateMap )
// ======== MEMBER FUNCTIONS ========
@@ -101,12 +95,7 @@
//
CRadioEngineHandler::~CRadioEngineHandler()
{
- if ( iEngine ) {
- iEngine->Settings().Repository().RemoveObserver( &iObserver );
- }
-
delete iEngine;
- delete iDelayTimer;
}
// ---------------------------------------------------------------------------
@@ -117,26 +106,12 @@
{
LOG_METHOD;
- iDelayTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-
iEngine = CRadioEngine::NewL( *this );
iEngine->SystemEventCollector().AddObserverL( &iObserver );
- iEngine->Settings().Repository().AddObserverL( &iObserver );
- iEngine->AudioRouter().SetAudioRouteL( RadioEngine::ERadioHeadset );
iEngine->AddObserverL( &iObserver );
iRegion = MAP_TO_UI_REGION( iEngine->Settings().EngineSettings().RegionId() );
-
-// iEngineHolder->PubSub().SetControlEventObserver( &iObserver );
-
-// iRadioEngine->SetVolumeMuted( EFalse );
-// iRadioEngine->SetVolume( MaxVolume() );
-
-// CVRRepositoryManager::GetRepositoryValueL( KVRCRUid, KVRCRLaunchCount, usageCount );
-// CVRRepositoryManager::SetRepositoryValueL( KVRCRUid, KVRCRLaunchCount, ++usageCount );
-// iControlEventObserver = CVRControlEventObserverImpl::NewL( *this );
-// doc->PubSubL().SetControlEventObserver( iControlEventObserver );
}
// ---------------------------------------------------------------------------
@@ -149,6 +124,22 @@
}
// ---------------------------------------------------------------------------
+// Starts or stops receiving RDS data
+// ---------------------------------------------------------------------------
+//
+void CRadioEngineHandler::SetRdsEnabled( TBool aRdsEnabled )
+ {
+ if ( aRdsEnabled )
+ {
+ iEngine->RdsReceiver().StartReceiver();
+ }
+ else
+ {
+ iEngine->RdsReceiver().StopReceiver();
+ }
+ }
+
+// ---------------------------------------------------------------------------
// Returns the radio status.
// ---------------------------------------------------------------------------
//
@@ -158,32 +149,39 @@
}
// ---------------------------------------------------------------------------
-// Tune to the specified frequency
+// Sets the manual seek status
// ---------------------------------------------------------------------------
//
-void CRadioEngineHandler::Tune( TUint aFrequency )
+void CRadioEngineHandler::SetManualSeekMode( TBool aManualSeek )
{
- iEngine->SetFrequency( aFrequency );
+ iEngine->SetManualSeekMode( aManualSeek );
}
// ---------------------------------------------------------------------------
-// Tune to the specified frequency after a delay
+// Returns the manual seek status
// ---------------------------------------------------------------------------
//
-void CRadioEngineHandler::TuneWithDelay( TUint aFrequency )
+TBool CRadioEngineHandler::IsInManualSeekMode() const
{
- iFrequency = aFrequency;
- iDelayTimer->Cancel();
- iDelayTimer->Start( KTuneDelay, KTuneDelay, TCallBack( TuneDelayCallback, this ) );
+ return iEngine->IsInManualSeekMode();
+ }
+
+// ---------------------------------------------------------------------------
+// Tune to the specified frequency
+// ---------------------------------------------------------------------------
+//
+void CRadioEngineHandler::SetFrequency( TUint aFrequency )
+ {
+ iEngine->SetFrequency( aFrequency );
}
// ---------------------------------------------------------------------------
// Sets the audio mute state
// ---------------------------------------------------------------------------
//
-void CRadioEngineHandler::SetMuted( const TBool aMuted )
+void CRadioEngineHandler::SetMuted( const TBool aMuted, const TBool aUpdateSettings )
{
- iEngine->SetVolumeMuted( aMuted );
+ iEngine->SetVolumeMuted( aMuted, aUpdateSettings );
}
// ---------------------------------------------------------------------------
@@ -261,7 +259,7 @@
// Retrieves the current frequency.
// ---------------------------------------------------------------------------
//
-TUint CRadioEngineHandler::TunedFrequency() const
+TUint CRadioEngineHandler::CurrentFrequency() const
{
return iEngine->Settings().EngineSettings().TunedFrequency();
}
@@ -297,7 +295,7 @@
// Scan up to the next available frequency
// ---------------------------------------------------------------------------
//
-void CRadioEngineHandler::Seek( Seeking::Direction direction )
+void CRadioEngineHandler::Seek( Seek::Direction direction )
{
LOG_TIMESTAMP( "Seek" );
iEngine->Seek( MAP_FROM_UI_DIRECTION( direction ) );
@@ -317,30 +315,12 @@
// Returns the engine seeking state
// ---------------------------------------------------------------------------
//
-Seeking::State CRadioEngineHandler::SeekingState() const
+Seek::State CRadioEngineHandler::SeekingState() const
{
return MAP_TO_UI_SEEKING_STATE( iEngine->Seeking() );
}
// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::StartScan( MRadioScanObserver& aObserver )
- {
- iEngine->StartScan( aObserver );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::StopScan( TInt aError )
- {
- iEngine->StopScan( aError );
- }
-
-// ---------------------------------------------------------------------------
// return step size for tuning.
// ---------------------------------------------------------------------------
//
@@ -382,24 +362,6 @@
}
// ---------------------------------------------------------------------------
-// Returns ar reference to the publish & subscribe handler
-// ---------------------------------------------------------------------------
-//
-CRadioPubSub& CRadioEngineHandler::PubSub()
- {
- return *iEngine->PubSub();
- }
-
-// ---------------------------------------------------------------------------
-// Returns the repository manager.
-// ---------------------------------------------------------------------------
-//
-CRadioRepositoryManager& CRadioEngineHandler::Repository() const
- {
- return iEngine->Settings().Repository();
- }
-
-// ---------------------------------------------------------------------------
// Returns the repository manager.
// ---------------------------------------------------------------------------
//
@@ -437,25 +399,3 @@
{
return CRadioSettings::NewL();
}
-
-// ---------------------------------------------------------------------------
-// From MRadioEngineInitializer
-//
-// ---------------------------------------------------------------------------
-//
-CRadioPubSub* CRadioEngineHandler::InitPubSubL()
- {
- return CRadioPubSub::NewL();
- }
-
-// --------------------------------------------------------------------------------
-// Static callback function to be used by the tune delay timer
-// --------------------------------------------------------------------------------
-//
-TInt CRadioEngineHandler::TuneDelayCallback( TAny* aSelf )
- {
- CRadioEngineHandler* self = static_cast<CRadioEngineHandler*>( aSelf );
- self->iDelayTimer->Cancel();
- self->Tune( self->iFrequency );
- return 0; // Not used by CPeriodic
- }
--- a/radioapp/radioenginewrapper/src/radiocontroleventlistener.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radiocontroleventlistener.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -71,7 +71,7 @@
void RadioControlEventListener::SeekL( RadioEngine::TRadioTuneDirection aDirection )
{
LOG_FORMAT( "RadioControlEventListener::SeekL: Direction: %d", aDirection );
- mEngine.startSeeking( aDirection == RadioEngine::ERadioDown ? Seeking::Down : Seeking::Up );
+ mEngine.startSeeking( aDirection == RadioEngine::ERadioDown ? Seek::Down : Seek::Up );
}
/*!
@@ -169,7 +169,7 @@
{
if( aDownPressed )
{
- mEngine.startSeeking( Seeking::Up );
+ mEngine.startSeeking( Seek::Up );
}
}
@@ -189,7 +189,7 @@
void RadioControlEventListener::RewindL( TBool aDownPressed )
{
if( aDownPressed ) {
- mEngine.startSeeking( Seeking::Down );
+ mEngine.startSeeking( Seek::Down );
}
}
@@ -215,7 +215,7 @@
void RadioControlEventListener::VolumeUpL( TBool aDownPressed )
{
if ( aDownPressed ) {
- mEngine.RadioEnginehandler().IncreaseVolume();
+ RUN_NOTIFY_LOOP( mEngine.observers(), increaseVolume() );
}
}
@@ -225,7 +225,7 @@
void RadioControlEventListener::VolumeDownL( TBool aDownPressed )
{
if ( aDownPressed ) {
- mEngine.RadioEnginehandler().DecreaseVolume();
+ RUN_NOTIFY_LOOP( mEngine.observers(), decreaseVolume() );
}
}
--- a/radioapp/radioenginewrapper/src/radioenginewrapper.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -26,8 +26,6 @@
RadioEngineWrapper::RadioEngineWrapper( RadioStationHandlerIf& stationHandler ) :
d_ptr( new RadioEngineWrapperPrivate( this, stationHandler ) )
{
- Q_D( RadioEngineWrapper );
- d->init();
}
/*!
@@ -41,6 +39,15 @@
/*!
*
*/
+bool RadioEngineWrapper::init()
+{
+ Q_D( RadioEngineWrapper );
+ return d->init();
+}
+
+/*!
+ *
+ */
void RadioEngineWrapper::addObserver( RadioEngineWrapperObserver* observer )
{
Q_D( RadioEngineWrapper );
@@ -57,15 +64,6 @@
}
/*!
- * Checks if the radio engine has been constructed properly
- */
-bool RadioEngineWrapper::isEngineConstructed()
-{
- Q_D( RadioEngineWrapper );
- return d->isEngineConstructed();
-}
-
-/*!
* Returns the settings handler owned by the engine
*/
RadioSettingsIf& RadioEngineWrapper::settings()
@@ -113,10 +111,9 @@
/*!
* Returns the frequency step size from the selected region
*/
-bool RadioEngineWrapper::isFrequencyValid( uint frequency )
+bool RadioEngineWrapper::isFrequencyValid( uint frequency ) const
{
- Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->IsFrequencyValid( frequency );
+ return frequency >= minFrequency() && frequency <= maxFrequency() && frequency % frequencyStepSize() == 0;
}
/*!
@@ -134,7 +131,7 @@
uint RadioEngineWrapper::currentFrequency() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->TunedFrequency();
+ return d->mEngineHandler->CurrentFrequency();
}
/*!
@@ -165,21 +162,57 @@
}
/*!
- * Tunes to the given frequency
+ * Sets or unsets the engine to manual seek mode
*/
-void RadioEngineWrapper::tuneFrequency( uint frequency, const int reason )
+void RadioEngineWrapper::setManualSeekMode( bool manualSeek )
{
Q_D( RadioEngineWrapper );
- d->tuneFrequency( frequency, reason );
+ d->mEngineHandler->SetManualSeekMode( manualSeek );
+}
+
+/*!
+ * Checks if the engine is in manual seek mode
+ */
+bool RadioEngineWrapper::isInManualSeekMode() const
+{
+ Q_D( const RadioEngineWrapper );
+ return d->mEngineHandler->IsInManualSeekMode();
}
/*!
- * Tunes to the given frequency after a delay
+ *
*/
-void RadioEngineWrapper::tuneWithDelay( uint frequency, const int reason )
+void RadioEngineWrapper::setRdsEnabled( bool rdsEnabled )
+{
+ Q_D( RadioEngineWrapper );
+ d->mEngineHandler->SetRdsEnabled( rdsEnabled );
+}
+
+/*!
+ * Tunes to the given frequency
+ */
+void RadioEngineWrapper::setFrequency( uint frequency, const int reason )
{
Q_D( RadioEngineWrapper );
- d->tuneWithDelay( frequency, reason );
+ d->setFrequency( frequency, reason );
+}
+
+/*!
+ * volume increase command for the engine
+ */
+void RadioEngineWrapper::increaseVolume()
+{
+ Q_D( RadioEngineWrapper );
+ d->mEngineHandler->IncreaseVolume();
+}
+
+/*!
+ * volume decrease command for the engine
+ */
+void RadioEngineWrapper::decreaseVolume()
+{
+ Q_D( RadioEngineWrapper );
+ d->mEngineHandler->DecreaseVolume();
}
/*!
@@ -194,10 +227,10 @@
/*!
*
*/
-void RadioEngineWrapper::setMute( bool muted )
+void RadioEngineWrapper::setMute( bool muted, bool updateSettings )
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->SetMuted( muted );
+ d->mEngineHandler->SetMuted( muted, updateSettings );
}
/*!
@@ -213,7 +246,7 @@
/*!
*
*/
-void RadioEngineWrapper::startSeeking( Seeking::Direction direction, const int reason )
+void RadioEngineWrapper::startSeeking( Seek::Direction direction, const int reason )
{
Q_D( RadioEngineWrapper );
d->startSeeking( direction, reason );
--- a/radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -25,10 +25,8 @@
#include "radio_global.h"
#include "cradioenginehandler.h"
#include "radiostationhandlerif.h"
-#include "cradiopubsub.h"
#include "radiocontroleventlistener.h"
#include "radiordslistener.h"
-#include "cradiorepositorymanager.h"
#include "radioenginewrapperobserver.h"
// Constants
@@ -43,7 +41,7 @@
mEngineHandler( new CRadioEngineHandler( *this ) ),
mControlEventListener( new RadioControlEventListener( *this ) ),
mRdsListener ( new RadioRdsListener( mStationHandler, *this ) ),
- mTuneReason( 0 ),
+ mTuneReason( TuneReason::Unspecified ),
mUseLoudspeaker( false )
{
}
@@ -61,37 +59,24 @@
/*!
* Initializes the private implementation
*/
-void RadioEngineWrapperPrivate::init()
+bool RadioEngineWrapperPrivate::init()
{
TRAPD( err, mEngineHandler->ConstructL() );
if ( err != KErrNone ) {
LOG_FORMAT( "RadioEngineWrapperPrivate::init, EngineHandler construct failed: %d", err );
mEngineHandler.reset();
- return;
- //TODO: Error handling?
+ return false;
}
mEngineHandler->SetRdsObserver( mRdsListener.data() );
- mEngineHandler->PubSub().SetControlEventObserver( mControlEventListener.data() );
mControlEventListener->init();
- // Start observing profile changes
- mEngineHandler->Repository().AddEntityL( KCRUidProfileEngine,
- KProEngActiveProfile,
- CRadioRepositoryManager::ERadioEntityInt );
-
mUseLoudspeaker = mEngineHandler->IsAudioRoutedToLoudspeaker();
if ( !mUseLoudspeaker ) {
RUN_NOTIFY_LOOP( mObservers, audioRouteChanged( false ) );
}
-}
-/*!
- * Starts up the radio engine
- */
-bool RadioEngineWrapperPrivate::isEngineConstructed()
-{
- return mEngineHandler != 0;
+ return true;
}
/*!
@@ -117,22 +102,11 @@
/*!
* Tunes to the given frequency
*/
-void RadioEngineWrapperPrivate::tuneFrequency( uint frequency, const int reason )
+void RadioEngineWrapperPrivate::setFrequency( uint frequency, const int reason )
{
- if ( mEngineHandler->TunedFrequency() != frequency ) {
+ if ( mEngineHandler->CurrentFrequency() != frequency ) {
mTuneReason = reason;
- mEngineHandler->Tune( frequency );
- }
-}
-
-/*!
- * Tunes to the given frequency after a delay
- */
-void RadioEngineWrapperPrivate::tuneWithDelay( uint frequency, const int reason )
-{
- if ( mEngineHandler->TunedFrequency() != frequency ) {
- mTuneReason = reason;
- mEngineHandler->TuneWithDelay( frequency );
+ mEngineHandler->SetFrequency( frequency );
}
}
@@ -147,7 +121,7 @@
/*!
*
*/
-void RadioEngineWrapperPrivate::startSeeking( Seeking::Direction direction, const int reason )
+void RadioEngineWrapperPrivate::startSeeking( Seek::Direction direction, const int reason )
{
mTuneReason = reason;
mEngineHandler->Seek( direction );
@@ -170,11 +144,13 @@
TInt aError )
{
Q_UNUSED( aReason );
- LOG_FORMAT( "RadioEngineWrapperPrivate::FrequencyEventL - Frequency: %d, Reason: %d, Error: %d", aFrequency, aReason, aError );
+ LOG_FORMAT( "RadioEngineWrapperPrivate::FrequencyEventL - Freq: %d, TuneReason: %d, Err: %d", aFrequency, mTuneReason, aError );
if ( !aError ) {
const uint frequency = static_cast<uint>( aFrequency );
RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( frequency, mTuneReason ) );
+ } else {
+ RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( mEngineHandler->MinFrequency(), TuneReason::StationScanNoStationsFound ) ); // no frequencies found
}
}
@@ -268,13 +244,3 @@
// ERadioAudioResourcesAvailable, ///< Audio resources have become available
// ERadioAudioAutoResumeForbidden ///< Audio auto resuming is forbidden
}
-
-/*!
- * \reimp
- */
-void RadioEngineWrapperPrivate::HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, TInt aValue, TInt aError )
-{
- if ( aUid == KCRUidProfileEngine && aKey == KProEngActiveProfile && !aError && aValue == KOfflineProfileId ) {
- LOG( "RadioEngineWrapperPrivate::HandleRepositoryValueChangeL: Offline profile activated" );
- }
-}
--- a/radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -26,8 +26,6 @@
RadioEngineWrapper::RadioEngineWrapper( RadioStationHandlerIf& stationHandler ) :
d_ptr( new RadioEngineWrapperPrivate( this, stationHandler ) )
{
- Q_D( RadioEngineWrapper );
- d->init();
}
/*!
@@ -41,6 +39,15 @@
/*!
*
*/
+bool RadioEngineWrapper::init()
+{
+ Q_D( RadioEngineWrapper );
+ return d->init();
+}
+
+/*!
+ *
+ */
void RadioEngineWrapper::addObserver( RadioEngineWrapperObserver* observer )
{
Q_D( RadioEngineWrapper );
@@ -57,15 +64,6 @@
}
/*!
- * Checks if the radio engine has been constructed properly
- */
-bool RadioEngineWrapper::isEngineConstructed()
-{
- Q_D( RadioEngineWrapper );
- return d->isEngineConstructed();
-}
-
-/*!
* Returns the settings handler owned by the engine
*/
RadioSettingsIf& RadioEngineWrapper::settings()
@@ -113,10 +111,10 @@
/*!
* Returns the frequency step size from the selected region
*/
-bool RadioEngineWrapper::isFrequencyValid( uint frequency )
+bool RadioEngineWrapper::isFrequencyValid( uint frequency ) const
{
Q_UNUSED( frequency );
- return true;
+ return frequency >= minFrequency() && frequency <= maxFrequency() && frequency % frequencyStepSize() == 0;
}
/*!
@@ -163,21 +161,52 @@
}
/*!
- * Tunes to the given frequency
+ * Sets or unsets the engine to manual seek mode
*/
-void RadioEngineWrapper::tuneFrequency( uint frequency, const int sender )
+void RadioEngineWrapper::setManualSeekMode( bool manualSeek )
{
Q_D( RadioEngineWrapper );
- d->tuneFrequency( frequency, sender );
+ d->mManualSeekMode = manualSeek;
+}
+
+/*!
+ * Checks if the engine is in manual seek mode
+ */
+bool RadioEngineWrapper::isInManualSeekMode() const
+{
+ Q_D( const RadioEngineWrapper );
+ return d->mManualSeekMode;
}
/*!
- * Tunes to the given frequency after a delay
+ *
*/
-void RadioEngineWrapper::tuneWithDelay( uint frequency, const int sender )
+void RadioEngineWrapper::setRdsEnabled( bool rdsEnabled )
+{
+ Q_UNUSED( rdsEnabled );
+}
+
+/*!
+ * Tunes to the given frequency
+ */
+void RadioEngineWrapper::setFrequency( uint frequency, const int reason )
{
Q_D( RadioEngineWrapper );
- d->tuneWithDelay( frequency, sender );
+ d->setFrequency( frequency, reason );
+}
+
+/*!
+ *
+ */
+void RadioEngineWrapper::increaseVolume()
+{
+}
+
+/*!
+ *
+ */
+void RadioEngineWrapper::decreaseVolume()
+{
}
/*!
@@ -192,8 +221,10 @@
/*!
*
*/
-void RadioEngineWrapper::setMute( bool muted )
+void RadioEngineWrapper::setMute( bool muted, bool updateSettings )
{
+ Q_UNUSED( muted );
+ Q_UNUSED( updateSettings );
}
/*!
@@ -208,7 +239,7 @@
/*!
*
*/
-void RadioEngineWrapper::startSeeking( Seeking::Direction direction, const int reason )
+void RadioEngineWrapper::startSeeking( Seek::Direction direction, const int reason )
{
Q_D( RadioEngineWrapper );
d->startSeeking( direction, reason );
--- a/radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -69,7 +69,8 @@
mFrequencyStepSize( 50000 ),
mRegionId( RadioRegion::Default ),
mMinFrequency( 87500000 ),
- mMaxFrequency( 108000000 )
+ mMaxFrequency( 108000000 ),
+ mManualSeekMode( false )
{
::theInstance = this;
mEngineSettings.reset( new QSettings( "Nokia", "QtFmRadio" ) );
@@ -78,7 +79,7 @@
mFrequency = mMinFrequency;
}
- connectAndTest( mTuneTimer, SIGNAL(timeout()), this, SLOT(frequencyEvent()) );
+ Radio::connect( mTuneTimer, SIGNAL(timeout()), this, SLOT(frequencyEvent()) );
mTuneTimer->setSingleShot( true );
}
@@ -103,7 +104,7 @@
/*!
* Initializes the private implementation
*/
-void RadioEngineWrapperPrivate::init()
+bool RadioEngineWrapperPrivate::init()
{
mUseLoudspeaker = false;
if ( !mUseLoudspeaker ) {
@@ -111,13 +112,6 @@
}
parseData();
-}
-
-/*!
- * Starts up the radio engine
- */
-bool RadioEngineWrapperPrivate::isEngineConstructed()
-{
return true;
}
@@ -136,23 +130,17 @@
/*!
* Tunes to the given frequency
*/
-void RadioEngineWrapperPrivate::tuneFrequency( uint frequency, const int reason )
+void RadioEngineWrapperPrivate::setFrequency( uint frequency, const int reason )
{
mNextFrequency = frequency;
mTuneReason = reason;
+
mTuneTimer->stop();
- mTuneTimer->start( 500 );
-}
-
-/*!
- * Tunes to the given frequency after a delay
- */
-void RadioEngineWrapperPrivate::tuneWithDelay( uint frequency, const int reason )
-{
- mNextFrequency = frequency;
- mTuneReason = reason;
- mTuneTimer->stop();
- mTuneTimer->start( 1500 );
+ if ( !mManualSeekMode ) {
+ mTuneTimer->start( 500 );
+ } else {
+ frequencyEvent();
+ }
}
/*!
@@ -166,9 +154,10 @@
/*!
*
*/
-void RadioEngineWrapperPrivate::startSeeking( Seeking::Direction direction, const int reason )
+void RadioEngineWrapperPrivate::startSeeking( Seek::Direction direction, const int reason )
{
mTuneReason = reason;
+ mNextFrequency = 0;
// Find the previous and next favorite from current frequency
uint previous = 0;
@@ -183,7 +172,7 @@
}
- if ( direction == Seeking::Up ) {
+ if ( direction == Seek::Up ) {
if ( next == 0 ) {
next = KScanFrequencies[0];
}
@@ -286,10 +275,14 @@
*/
void RadioEngineWrapperPrivate::frequencyEvent()
{
- mFrequency = mNextFrequency;
- mEngineSettings->setValue( KKeyFrequency, mFrequency );
+ if ( mNextFrequency > 0 ) {
+ mFrequency = mNextFrequency;
+ mEngineSettings->setValue( KKeyFrequency, mFrequency );
+ }
- RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( mFrequency, mTuneReason ) );
+ if ( !mManualSeekMode ) {
+ RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( mNextFrequency, mTuneReason ) );
+ }
}
/*!
--- a/radioapp/radioenginewrapper/src/radioenginewrapperobserver.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radioenginewrapperobserver.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -51,6 +51,22 @@
/*!
*
+ */
+void RadioEngineWrapperObserver::increaseVolume()
+{
+ // Default implementation does nothing
+}
+
+/*!
+ *
+ */
+void RadioEngineWrapperObserver::decreaseVolume()
+{
+ // Default implementation does nothing
+}
+
+/*!
+ *
* @param volume
*/
void RadioEngineWrapperObserver::volumeChanged( int volume )
--- a/radioapp/radioenginewrapper/src/radiologger.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +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 = "| ";
-
-/*!
- *
- */
-static QString formatString( const char* format, long val )
-{
- if ( strcmp( format, "" ) == 0 ) {
- return "";
- }
- QString string;
- string.sprintf( format, val );
- return string;
-}
-
-/*!
- *
- */
-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/radioapp/radioenginewrapper/src/radiordslistener.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radiordslistener.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -27,7 +27,7 @@
*/
static QString convertString( const TDesC& aDesc )
{
- return QString( (QChar*)aDesc.Ptr(), aDesc.Length() );
+ return QString::fromUtf16( aDesc.Ptr(), aDesc.Length() );
}
/*!
@@ -102,10 +102,13 @@
const TInt aRadioTextPlusClass,
const TDesC& aRadioText )
{
- if ( aRadioText.Length() > 0 ) {
- const uint frequency = static_cast<uint>( aFrequency );
- mStationHandler.setCurrentRadioTextPlus( frequency, aRadioTextPlusClass, convertString( aRadioText ) );
+ TInt rtClass = aRadioTextPlusClass;
+ if ( aRadioTextPlusClass == RtPlus::Band ) {
+ rtClass = RtPlus::Artist;
}
+
+ const uint frequency = static_cast<uint>( aFrequency );
+ mStationHandler.setCurrentRadioTextPlus( frequency, rtClass, convertString( aRadioText ) );
}
/*!
--- a/radioapp/radioenginewrapper/src/radiosettings.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radiosettings.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -60,6 +60,15 @@
/*!
* \reimp
*/
+void RadioSettings::setFirstTimeStartPerformed( bool firstTimeStartPerformed )
+{
+ Q_D( RadioSettings );
+ d->setFirstTimeStartPerformed( firstTimeStartPerformed );
+}
+
+/*!
+ * \reimp
+ */
bool RadioSettings::showFavorites() const
{
Q_D( const RadioSettings );
--- a/radioapp/radioenginewrapper/src/radiosettings_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radiosettings_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -53,7 +53,7 @@
bool RadioSettingsPrivate::isFirstTimeStart()
{
if ( mSettingsStorage ) {
- return mSettingsStorage->UpdateStartCount() == 0;
+ return mSettingsStorage->IsFirstTimeStart();
}
return false;
}
@@ -61,6 +61,16 @@
/*!
*
*/
+void RadioSettingsPrivate::setFirstTimeStartPerformed( bool firstTimeStartPerformed )
+{
+ if ( mSettingsStorage ) {
+ mSettingsStorage->SetFirstTimeStartPerformed( firstTimeStartPerformed );
+ }
+}
+
+/*!
+ *
+ */
bool RadioSettingsPrivate::isFlagSet( ToggleFlag flag ) const
{
return mFlags.testFlag( flag );
--- a/radioapp/radioenginewrapper/src/radiosettings_win32_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radioenginewrapper/src/radiosettings_win32_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -58,6 +58,14 @@
/*!
*
*/
+void RadioSettingsPrivate::setFirstTimeStartPerformed( bool firstTimeStartPerformed )
+{
+ Q_UNUSED( firstTimeStartPerformed );
+}
+
+/*!
+ *
+ */
bool RadioSettingsPrivate::isFlagSet( ToggleFlag flag ) const
{
return mFlags.testFlag( flag );
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/stub/radioenginewrapper_stub.pro Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,99 @@
+#
+# 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 the License "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(../../buildflags.pri)
+
+TEMPLATE = lib
+TARGET = radioenginewrapper_stub
+CONFIG += dll
+DEFINES += BUILD_WRAPPER_DLL
+win32:DESTDIR = ../bin
+
+# Wrapper does not depend on QtGui or Orbit
+QT = core
+CONFIG -= gui hb
+USE_DUMMY_RADIO_DATA:QT += xml
+
+symbian: {
+ DEFINES += SYMBIAN
+ TARGET.EPOCALLOWDLLDATA = 1
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
+
+ INCLUDEPATH += ../../../radioengine/utils/api
+ INCLUDEPATH += ../../../radioengine/settings/api
+ INCLUDEPATH += ../../../radioengine/engine/api
+}
+
+win32: {
+ INCLUDEPATH += inc/win32
+}
+INCLUDEPATH += ../inc
+INCLUDEPATH += ../commoninc
+
+
+symbian:LIBS *= -lradioengineutils_stub
+symbian:LIBS *= -lradioenginesettings_stub
+symbian:LIBS *= -lradioengine_stub
+symbian:LIBS *= -lflogger
+
+DEPENDPATH += $$INCLUDEPATH ../src
+
+# $$_PRO_FILE_PWD_ points to the directory of the pro file
+MOC_DIR = $$_PRO_FILE_PWD_/tmp
+
+# Input
+HEADERS += radiowrapperexport.h
+HEADERS += radio_global.h
+HEADERS += radiologger.h
+HEADERS += radioenginewrapper.h
+HEADERS += radiosettings.h
+HEADERS += radiostationhandlerif.h
+
+INTERNAL_HEADERS += radiosettings_p.h
+
+symbian: {
+ HEADERS += cradioenginehandler.h
+ HEADERS += mradioenginehandlerobserver.h
+ HEADERS += radiofrequencyscanninghandler.h
+ HEADERS += radiocontroleventlistener.h
+ HEADERS += radiordslistener.h
+
+ INTERNAL_HEADERS += radioenginewrapper_p.h
+}
+
+#USE_DUMMY_RADIO_DATA:HEADERS += t_radiodataparser.h
+
+win32:HEADERS += radioenginewrapper_win32_p.h
+win32:HEADERS += $$INTERNAL_HEADERS
+
+SOURCES += radiosettings.cpp
+SOURCES += radiologger.cpp
+
+symbian: {
+ SOURCES += radiosettings_p.cpp
+ SOURCES += radioenginewrapper.cpp
+ SOURCES += radioenginewrapper_p.cpp
+ SOURCES += cradioenginehandler.cpp
+ SOURCES += radiofrequencyscanninghandler.cpp
+ SOURCES += radiocontroleventlistener.cpp
+ SOURCES += radiordslistener.cpp
+}
+
+#USE_DUMMY_RADIO_DATA:SOURCES += t_radiodataparser.cpp
+
+win32:SOURCES += radiosettings_win32_p.cpp
+win32:SOURCES += radioenginewrapper_win32.cpp
+win32:SOURCES += radioenginewrapper_win32_p.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/inc/mschedulerstartandstoptimerobserver.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,59 @@
+/*
+* 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: Callback interface for observer of CAccSrvResetInactivityTimeTimer object.
+*
+*/
+
+
+
+
+#ifndef M_SCHEDULERSTARTANDSTOPTIMEROBSERVER_H
+#define M_SCHEDULERSTARTANDSTOPTIMEROBSERVER_H
+
+
+#include <e32def.h>
+
+
+/**
+ * Callback interface for observer of CSchedulerStopAndStartTimer object.
+ *
+ * This callback interface has to be implemented by observer class.
+ * @code
+ * ?good_class_usage_example(s)
+ * @endcode
+ *
+ * @lib AccServer.exe
+ * @since S60 10.1
+ */
+NONSHARABLE_CLASS( MSchedulerStartAndStopTimerObserver )
+ {
+
+public:
+
+ /**
+ * Function is called by timer watcher every time when timer elapses.
+ *
+ * @since S60 10.1
+ * @param none.
+ * @return none
+ */
+ virtual void Timeout( TUint aTimerId ) = 0;
+
+ virtual void CreateMUT() = 0;
+ virtual void DeleteMUT() = 0;
+
+ };
+
+
+#endif // M_SCHEDULERSTARTANDSTOPTIMEROBSERVER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/inc/t_radioenginewrapper.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,201 @@
+/*
+* 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 T_RADIOENGINEWRAPPER_H_
+#define T_RADIOENGINEWRAPPER_H_
+
+
+// INCLUDES
+#include <QtTest/QtTest>
+#include <e32property.h>
+#include <centralrepository.h>
+
+#include "radioenginewrapperobserver.h"
+#include "radiostationhandlerif.h"
+//#include "radiostation.h"
+#include "radiostubmanager.h"
+#include "t_schedulerstartandstoptimer.h"
+
+class RadioUiEngine;
+class RadioStationModel;
+class RadioPlayLogModel;
+class RadioPresetStorage;
+class RadioEngineWrapper;
+//class RadioStationHandlerIf;
+
+class TestRadioEngineWrapper : public QObject, RadioStationHandlerIf, RadioEngineWrapperObserver, MSchedulerStartAndStopTimerObserver
+{
+ Q_OBJECT
+
+ /**
+ * Flags to indicate which slots have been entered since calling API method.
+ * Declared to use QFlags<> to ease flag usage and to enforce type safety.
+ */
+ enum SlotEnteredFlag
+ {
+ NoSlotsEntered = 0
+ ,HeadsetConnected = 1 << 0
+ ,SeekingStarted = 1 << 1
+ ,TunedToFrequency = 1 << 2
+ ,MuteChanged = 1 << 3
+ ,VolumeChanged = 1 << 4
+ ,ItemAdded = 1 << 5
+ };
+ Q_DECLARE_FLAGS( Slots, SlotEnteredFlag )
+
+public:
+
+ TestRadioEngineWrapper();
+ ~TestRadioEngineWrapper();
+
+public slots:
+// void dataChanged(const QModelIndex topLeft, const QModelIndex bottomRight);
+// void stationAdded( RadioStation addedStation );
+// void stationDataChanged( RadioStation station );
+// void favoriteChanged( RadioStation station );
+// void itemAdded();
+
+private slots:
+ // test framework called slots
+ void initTestCase();
+ void init();
+ void cleanup();
+
+ void testIsEngineConstructed();
+
+ void testRadioSettingsReference();
+
+ void testRegion();
+
+ void testRadioOnOff();
+
+ void testTuning();
+
+ void testTuningWithDelay();
+
+ void testMuteToggling();
+
+ void testVolumeSetting();
+
+ void testLoudSpeakerUsage();
+
+ void testScanning();
+
+ void cleanupTestCase();
+
+private:
+
+ // from base class RadioStationHandlerIf =>
+ uint currentFrequency() const;
+ int currentPresetIndex() const;
+
+ void setCurrentStation( uint frequency );
+
+ bool containsFrequency( uint frequency );
+
+ bool containsPresetIndex( int presetIndex );
+
+ void startDynamicPsCheck();
+
+ void addScannedFrequency( uint frequency );
+
+ void removeLocalStations();
+
+ void setCurrentPsName( uint frequency, const QString& name );
+ void setCurrentRadioText( uint frequency, const QString& radioText );
+ void setCurrentRadioTextPlus( uint frequency, int rtClass, const QString& rtItem );
+ void setCurrentPiCode( uint frequency, int piCode );
+ void setCurrentGenre( uint frequency, int genre );
+ // <= from base class RadioStationHandlerIf
+
+ // c =>
+ void tunedToFrequency( uint frequency, int commandSender );
+ void seekingStarted( Seeking::Direction direction );
+ void radioStatusChanged( bool radioIsOn );
+
+ void rdsAvailabilityChanged( bool available );
+
+ void volumeChanged( int volume );
+ void muteChanged( bool muted );
+
+ void audioRouteChanged( bool loudspeaker );
+ void scanAndSaveFinished();
+ void headsetStatusChanged( bool connected );
+
+ void skipPrevious();
+ void skipNext();
+ // <= from base class RadioStationHandlerIf
+
+ // subfunctions used by the test framework called slots =>
+ // void testRadioStationModelInit();
+
+ // from base class MSchedulerStartAndStopTimerObserver =>
+ void Timeout( TUint aTimerId );
+ void CreateMUT();
+ void DeleteMUT();
+ // <=
+
+ void tstSetTunerCababilities(uint category = 0);
+ void tstSetFrequency( TUint aFrequency );
+ TInt tstGetFrequency();
+ void tstSetScanningData( TUint aCount, TInt aMinFreq, TInt aFrequencyStepSize );
+ void tstDefineAndAttachRadioServerProperties();
+ void tstCreateCRObjects();
+
+private:
+ RadioEngineWrapper* mEngineWrapper;
+
+ // RadioStubManager pointer points inside RadioStubManagerChunk
+ SRadioStubManager* mRadioStubManager;
+
+ // RadioStubManagerChunk handle
+ RChunk mRadioStubManagerChunk;
+
+ // Active scheduler
+ // Workaround for the below panic, occured after porting to 10.1
+ // Main Panic E32USER-CBase 44
+ // Create and install the active scheduler
+ CActiveScheduler* mScheduler;
+
+ //QScopedPointer<RadioEngineWrapper> mEngineWrapper;
+
+ //int mExpectedStationCount;
+
+ Slots mEnteredSlots;
+ //QString mStationToBeAdded;
+
+ CSchedulerStopAndStartTimer* mSchedulerTimer;
+
+ RProperty mPropertyPlayerState;
+ RProperty mPropertyAntennaStatus;
+ RProperty mPropertyOfflineMode;
+ RProperty mPropertyTransmitterStatus;
+ RProperty mPropertyFrequency;
+ RProperty mPropertyFrequencyRange;
+ RProperty mPropertyForceMonoReception;
+ RProperty mPropertySquelch;
+ RProperty mPropertyVolume;
+ RProperty mPropertyMuteStatus;
+ RProperty mPropertyBalance;
+
+ CRepository* mRadioCR;
+
+ TInt mLastRecordedVolume;
+};
+
+#endif /* T_RADIOENGINEWRAPPER_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/inc/t_schedulerstartandstoptimer.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,144 @@
+/*
+* 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: Timer for Starting and Stopping current Active Scheduler.
+*
+*/
+
+
+
+#ifndef C_ACCSRVRESETINACTIVITYTIMETIMER_H
+#define C_ACCSRVRESETINACTIVITYTIMETIMER_H
+
+
+
+#include <e32base.h>
+
+
+#include "mschedulerstartandstoptimerobserver.h"
+
+
+/** Timer's default value in micro seconds */
+const TInt KTimerDefaultValue = 400;
+
+
+/**
+ * Timer class for Starting and Stopping current Active Scheduler.
+ *
+ *
+ * @code
+ * ?good_class_usage_example(s)
+ * @endcode
+ *
+ * @lib AccServer.exe
+ * @since S60 10.1
+ */
+NONSHARABLE_CLASS( CSchedulerStopAndStartTimer ): public CTimer
+ {
+
+public:
+ enum TTimerId{
+ ETimerIdRunMUT = 0,
+ ETimerIdCreateMUT = 1,
+ ETimerIdDeleteMUT = 2
+ };
+
+
+ /**
+ * Two-phased constructor.
+ * @param aSchedulerStartAndStopTimerObserver Observer callback interface.
+ */
+ static CSchedulerStopAndStartTimer* NewL(
+ MSchedulerStartAndStopTimerObserver& aSchedulerStartAndStopTimerObserver );
+
+ /**
+ * Destructor.
+ */
+ virtual ~CSchedulerStopAndStartTimer();
+
+ /**
+ * Starts the timer.
+ * @since S60 10.1
+ * @param aTime Time out value.
+ * @param aTimeId Timer Id.
+ * @return void
+ */
+ void StartTimer( TInt aTime = KTimerDefaultValue,
+ TUint aTimerId = ETimerIdRunMUT );
+
+
+protected:
+
+ /**
+ * From CActive.
+ * Handles an active object's request completion event.
+ *
+ * @since S60 10.1
+ * @param void
+ */
+ void RunL();
+
+ /**
+ * From CActive.
+ * Handles RunL's leave cases
+ *
+ * @since S60 10.1
+ * @param aError Error code.
+ */
+ TInt RunError( TInt aError );
+
+
+private:
+
+ /**
+ * C++ default constructor.
+ * @param aSchedulerStartAndStopTimerObserver Observer callback interface.
+ */
+ CSchedulerStopAndStartTimer(
+ MSchedulerStartAndStopTimerObserver& aSchedulerStartAndStopTimerObserver );
+
+ /**
+ * By default Symbian OS constructor is private.
+ * @param none.
+ */
+ void ConstructL();
+
+
+private: // data
+ enum TTmerPhase
+ {
+ ETimerPhaseUndefined = 0,
+ ETimerPhaseStarting = 1,
+ ETimerPhaseStarted = 2
+ };
+
+ /**
+ * TimeOut time
+ */
+ TInt iTime;
+
+ /**
+ * Timer id. Client specific i.e same value is returned to observer.
+ */
+ TUint iTimerId;
+
+ /**
+ * ResetInactivityTimeTimerObserver object.
+ */
+ MSchedulerStartAndStopTimerObserver& iSchedulerStartAndStopTimerObserver;
+
+ TTmerPhase iPhase;
+ };
+
+
+#endif // C_ACCSRVRESETINACTIVITYTIMETIMER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/inc/trace.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,596 @@
+/*
+* 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:
+* Trace macro definitions.
+*
+*/
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include <e32base.h> // TCleanupItem
+#include "traceconfiguration.hrh"
+
+#ifdef TRACE_INTO_FILE
+#include <flogger.h> // RFileLogger
+#else
+#include <e32debug.h> // RDebug
+#endif
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+//
+
+// NOTE!
+// Replace all COMPONENT_NAME occurnaces with your own component / module name.
+
+/**
+* Prefix trace macro to complete tracing with component name.
+* Returns TDesC which can be used directly with RDebug or RFileLogger.
+*/
+#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[t_radioenginewrapper]: " L##aMsg )
+
+/**
+* Prefix error trace
+*/
+#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
+
+/**
+* Prefix info trace.
+*/
+#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg )
+
+/**
+* Prefix macro for strings
+*/
+#define _PREFIX_CHAR( aMsg ) (const char*)"[t_radioenginewrapper]: " ##aMsg
+
+/**
+* Define needed directories if TRACE_INTO_FILE macro in use
+*/
+#ifdef TRACE_INTO_FILE
+
+ _LIT( KDir, "radio" );
+ _LIT( KFile, "radio.txt" );
+ _LIT( KFullPath, "c:\\logs\\radio\\" );
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Error trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef ERROR_TRACE
+
+ /**
+ * Error trace definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define ERROR( aErr, aMsg )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr );\
+ }\
+ }
+ #define ERROR_1( aErr, aMsg, aP1 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+ }\
+ }
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+ }\
+ }
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+ }\
+ }
+ #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\
+ }\
+ }
+ #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
+ }\
+ }
+ #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
+ }\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define ERROR( aErr, aMsg )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
+ }\
+ }
+ #define ERROR_1( aErr, aMsg, aP1 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+ }\
+ }
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+ }\
+ }
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+ }\
+ }
+ #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\
+ }\
+ }
+ #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
+ }\
+ }
+ #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5, aP6 );\
+ }\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+ #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
+ #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
+ #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
+ #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
+ #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 ) ERROR_4( KErrGeneral, aMsg, aP1, aP3, aP4 )
+ #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 ) ERROR_5( KErrGeneral, aMsg, aP1, aP3, aP4, aP5 )
+ #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) ERROR_6( KErrGeneral, aMsg, aP1, aP3, aP4, aP5, aP6 )
+
+#else//ERROR_TRACE not defined
+
+ #define ERROR( aErr, aMsg )
+ #define ERROR_1( aErr, aMsg, aP1 )
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
+ #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )
+ #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
+
+ #define ERROR_GEN( aMsg )
+ #define ERROR_GEN_1( aMsg, aP1 )
+ #define ERROR_GEN_2( aMsg, aP1, aP2 )
+ #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
+ #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 )
+ #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
+
+#endif//ERROR_TRACE
+
+//-----------------------------------------------------------------------------
+// TRAP and trace with error macro
+//-----------------------------------------------------------------------------
+//
+#define TRAP_ERROR( aErr, aFunction )\
+ {\
+ TRAP( aErr, aFunction );\
+ TPtrC8 file( ( TText8* )__FILE__ );\
+ ERROR_2( aErr, "Trapped leave in '%S' line %d", &file, __LINE__);\
+ }
+
+//-----------------------------------------------------------------------------
+// Info trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef INFO_TRACE
+
+ /**
+ * Info log message definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define INFO( aMsg )\
+ {\
+ RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ) );\
+ }
+ #define INFO_1( aMsg, aP1 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1 );\
+ }
+ #define INFO_2( aMsg, aP1, aP2 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2 );\
+ }
+ #define INFO_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
+ }
+ #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
+ }
+ #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+ }
+ #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define INFO( aMsg )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ) );\
+ }
+ #define INFO_1( aMsg, aP1 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\
+ }
+ #define INFO_2( aMsg, aP1, aP2 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\
+ }
+ #define INFO_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
+ }
+ #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
+ }
+ #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+ }
+ #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//INFO_TRACE not defined
+
+ #define INFO( aMsg )
+ #define INFO_1( aMsg, aP1 )
+ #define INFO_2( aMsg, aP1, aP2 )
+ #define INFO_3( aMsg, aP1, aP2, aP3 )
+ #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )
+ #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
+
+#endif//INFO_TRACE
+
+//-----------------------------------------------------------------------------
+// Trace current client thread name and process id
+//-----------------------------------------------------------------------------
+//
+#ifdef CLIENT_TRACE
+
+ #define CLIENT_PROCESS\
+ {\
+ CLIENT_PROCESS_PREFIX( "" );\
+ }
+
+ #define CLIENT_PROCESS_PREFIX( aPrefix )\
+ {\
+ RProcess process;\
+ TPtrC name( process.Name() );\
+ TSecureId sid( process.SecureId() );\
+ TPtrC prefix( _S( aPrefix ) );\
+ if( prefix.Length() )\
+ {\
+ INFO_3( "%S: CLIENT - Name: [%S], Sid: [0x%x]", &prefix, &name, sid.iId );\
+ }\
+ else\
+ {\
+ INFO_2( "CLIENT - Name: [%S], Sid: [0x%x]", &name, sid.iId );\
+ }\
+ process.Close();\
+ }
+
+ #define CLIENT_MESSAGE( aMsg )\
+ {\
+ CLIENT_MESSAGE_PREFIX( "", aMsg );\
+ }
+
+ #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )\
+ {\
+ RThread thread;\
+ TInt err = aMsg.Client( thread );\
+ if( err == KErrNone )\
+ {\
+ RProcess process;\
+ err = thread.Process( process );\
+ if( err == KErrNone )\
+ {\
+ TPtrC threadName( thread.Name() );\
+ TUid processUid( process.SecureId() );\
+ TPtrC prefix( _S( aPrefix ) );\
+ if( prefix.Length() )\
+ {\
+ INFO_4( "%S: MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\
+ &prefix,\
+ &threadName,\
+ processUid,\
+ aMsg.Function() );\
+ }\
+ else\
+ {\
+ INFO_3( "MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\
+ &threadName,\
+ processUid,\
+ aMsg.Function() );\
+ }\
+ }\
+ process.Close();\
+ }\
+ thread.Close();\
+ }
+
+#else
+
+ #define CLIENT_PROCESS
+ #define CLIENT_PROCESS_PREFIX( aPrefix )
+ #define CLIENT_MESSAGE( aMsg )
+ #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Function trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef FUNC_TRACE
+
+ /**
+ * Function logging definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define FUNC( aMsg, aP1 )\
+ {\
+ TPtrC8 trace( _S8( aMsg ) );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\
+ }\
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define FUNC( aMsg, aP1 )\
+ {\
+ RDebug::Printf( aMsg, aP1 );\
+ }\
+
+ #endif//TRACE_INTO_FILE
+
+ /**
+ * Function trace helper class.
+ *
+ * NOTE:
+ * LC -methods cannot be trapped. Therefore if LC -method leaves
+ * END trace is used instead of LEAVE trace.
+ * If you have an idea how to round this problem please tell.
+ */
+ _LIT8( KFuncNameTerminator, "(" );
+ _LIT8( KFuncLeavePatternL, "L" );
+ class TFuncLog
+ {
+ public:
+ static void Cleanup( TAny* aPtr )
+ {
+ TFuncLog* self = static_cast< TFuncLog* >( aPtr );
+ self->iLeft = ETrue;
+ FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected
+ }
+ inline TFuncLog( const char* aFunc ) :
+ iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
+ iLeft( EFalse ),
+ iCleanupItem( Cleanup, this ),
+ iCanLeave( EFalse )
+ {
+ TInt pos( iFunc.Find( KFuncNameTerminator ) );
+ if( pos != KErrNotFound )
+ {
+ iFunc.Set( iFunc.Left( pos ) );
+ iCanLeave = !iFunc.Right( KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL );
+ if ( iCanLeave )
+ {
+ CleanupStack::PushL( iCleanupItem ); // Ignore warnings
+ }
+ }
+ FUNC( _PREFIX_CHAR("%S-START"), &iFunc );
+ }
+
+ inline ~TFuncLog()
+ {
+ if ( !iLeft )
+ {
+ if ( iCanLeave )
+ {
+ CleanupStack::Pop( this ); // Pop the cleanup item
+ }
+ FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished
+ }
+ }
+
+ private: // Data
+ TPtrC8 iFunc;
+ TBool iLeft;
+ TCleanupItem iCleanupItem;
+ TBool iCanLeave;
+ };
+ #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ );
+
+#else//FUNC_TRACE not defined
+
+ #define FUNC_LOG
+
+#endif//FUNC_TRACE
+
+//-----------------------------------------------------------------------------
+// Timestamp trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef TIMESTAMP_TRACE
+
+ #ifdef TRACE_INTO_FILE
+
+ #define TIMESTAMP( aCaption )\
+ {\
+ TTime t;\
+ t.HomeTime();\
+ TDateTime dt = t.DateTime();\
+ _LIT( KCaption, aCaption );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
+ _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
+ &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define TIMESTAMP( aCaption )\
+ {\
+ TTime t;\
+ t.HomeTime();\
+ TDateTime dt = t.DateTime();\
+ _LIT( KCaption, aCaption );\
+ RDebug::Print( _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
+ &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//TIMESTAMP_TRACE not defined
+
+ #define TIMESTAMP( aCaption )
+
+#endif//TIMESTAMP_TRACE
+
+#ifdef HEAP_TRACE
+
+ #ifdef TRACE_INTO_FILE
+
+ #define HEAP( aMsg )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace );\
+ }
+ #define HEAP_1( aMsg, aP1 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
+ }
+ #define HEAP_2( aMsg, aP1, aP2 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
+ }
+ #define HEAP_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
+ }
+ #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define HEAP( aMsg )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace );\
+ }
+ #define HEAP_1( aMsg, aP1 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
+ }
+ #define HEAP_2( aMsg, aP1, aP2 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
+ }
+ #define HEAP_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
+ }
+ #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//HEAP_TRACE not defined
+
+ #define HEAP( aMsg )
+ #define HEAP_1( aMsg, aP1 )
+ #define HEAP_2( aMsg, aP1, aP2 )
+ #define HEAP_3( aMsg, aP1, aP2, aP3 )
+ #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )
+
+#endif//HEAP_TRACE
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/inc/traceconfiguration.hrh Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,78 @@
+/*
+* 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:
+* Trace Macro Configurations.
+*
+*/
+
+#ifndef TRACECONFIGURATION_HRH
+#define TRACECONFIGURATION_HRH
+
+//-----------------------------------------------------------------------------
+// Trace definitions
+//-----------------------------------------------------------------------------
+//
+
+/**
+* Error trace enabled
+*/
+#ifdef _DEBUG
+ #define ERROR_TRACE
+#else
+ #undef ERROR_TRACE
+#endif
+
+/**
+* Info trace enabled
+*/
+#ifdef _DEBUG
+ #define INFO_TRACE
+#else
+ #undef INFO_TRACE
+#endif
+
+/**
+* Timestamp tracing on
+*/
+#ifdef _DEBUG
+ #define TIMESTAMP_TRACE
+#else
+ #undef TIMESTAMP_TRACE
+#endif
+
+/**
+* Tracing current client process and thread
+*/
+#ifdef _DEBUG
+ #define CLIENT_TRACE
+#else
+ #undef CLIENT_TRACE
+#endif
+
+/**
+* Function trace enabled
+*/
+#ifdef _DEBUG
+ #define FUNC_TRACE
+#else
+ #undef FUNC_TRACE
+#endif
+
+/**
+* Tracing into file enabled, default RDebug
+*/
+#undef TRACE_INTO_FILE
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/src/t_radioenginewrapper.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,621 @@
+/*
+* 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: radiostation test implementation
+*
+*/
+
+#include <e32base.h>
+#include <eikenv.h>
+#include <e32property.h>
+#include <radiomonitor.h>
+
+#include "t_radioenginewrapper.h"
+//#include "radiopresetstorage.h"
+//#include "radiostation.h"
+//#include "radiostationmodel.h"
+//#include "radioplaylogmodel.h"
+#include "radioenginewrapper.h"
+#include "radiologger.h" //Radio::connect
+#include <cradiosettings.h>
+#include "mradioenginesettings.h"
+#include <radiostubmanager.h>
+#include "trace.h"
+#include "RadioClientServer.h"
+#include "radiointernalcrkeys.h"
+
+#define STUB mRadioStubManager
+#define TUNER mRadioStubManager->iTuner
+#define PLAYER mRadioStubManager->iPlayer
+#define RDS mRadioStubManager->iRds
+#define ACCESSORYOBSERVER mRadioStubManager->iAccessoryObserver
+#define REMCONTARGET mRadioStubManager->iRemConTarget
+
+// Constants
+const uint KTestFrequency1 = 89000000;
+const QString KTestStationName1 = "Radio Noice";
+
+// CONSTANTS
+_LIT_SECURITY_POLICY_PASS(KRadioServerReadPolicy);
+_LIT_SECURITY_POLICY_C1(KRadioServerWritePolicy, ECapabilityWriteUserData);
+
+/*!
+ *
+ */
+int main(int /* argc*/, char *argv[])
+{
+FUNC_LOG;
+ TestRadioEngineWrapper tv;
+
+ char *pass[3];
+ pass[0] = argv[0];
+ pass[1] = "-o";
+ pass[2] = "c:\\data\\testradiouiengine.txt";
+
+ int res = QTest::qExec(&tv, 3, pass);
+
+ return res;
+}
+
+TestRadioEngineWrapper::TestRadioEngineWrapper()
+{
+FUNC_LOG;
+}
+
+// from base class RadioStationHandlerIf
+
+uint TestRadioEngineWrapper::currentFrequency() const
+{
+FUNC_LOG;
+return 0;
+}
+
+int TestRadioEngineWrapper::currentPresetIndex() const
+{
+FUNC_LOG;
+return 0;
+}
+
+void TestRadioEngineWrapper::setCurrentStation( uint /*frequency*/ )
+{
+FUNC_LOG;
+}
+
+bool TestRadioEngineWrapper::containsFrequency( uint /*frequency*/ )
+{
+FUNC_LOG;
+return 1;
+}
+
+bool TestRadioEngineWrapper::containsPresetIndex( int /*presetIndex*/ )
+{
+FUNC_LOG;
+return 1;
+}
+
+void TestRadioEngineWrapper::startDynamicPsCheck()
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::addScannedFrequency( uint /*frequency*/ )
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::removeLocalStations()
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::setCurrentPsName( uint /*frequency*/, const QString& /*name*/ )
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::setCurrentRadioText( uint /*frequency*/, const QString& /*radioText*/ )
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::setCurrentRadioTextPlus( uint /*frequency*/, int /*rtClass*/, const QString& /*rtItem*/ )
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::setCurrentPiCode( uint /*frequency*/, int /*piCode*/ )
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::setCurrentGenre( uint /*frequency*/, int /*genre*/ )
+{
+FUNC_LOG;
+}
+
+// from base class RadioEngineWrapperObserver
+
+void TestRadioEngineWrapper::tunedToFrequency( uint frequency, int /* commandSender */)
+{
+ FUNC_LOG;
+ mEnteredSlots |= TunedToFrequency;
+ TInt err = mRadioCR->Set( KRadioCRTunedFrequency , (TInt)frequency );
+ QVERIFY2( KErrNone == err, "Setting key KRadioCRTunedFrequency failed!" );
+}
+
+
+void TestRadioEngineWrapper::seekingStarted( Seeking::Direction /* direction */)
+{
+FUNC_LOG;
+mEnteredSlots |= SeekingStarted;
+}
+
+void TestRadioEngineWrapper::radioStatusChanged( bool /* radioIsOn */)
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::rdsAvailabilityChanged( bool /* available */)
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::volumeChanged( int volume )
+{
+FUNC_LOG;
+mEnteredSlots |= VolumeChanged;
+mLastRecordedVolume = volume;
+}
+
+void TestRadioEngineWrapper::muteChanged( bool /* muted */)
+{
+FUNC_LOG;
+mEnteredSlots |= MuteChanged;
+}
+
+void TestRadioEngineWrapper::audioRouteChanged( bool /* loudspeaker */)
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::scanAndSaveFinished()
+{
+FUNC_LOG;
+}
+
+
+void TestRadioEngineWrapper::headsetStatusChanged( bool /* connected */)
+{
+FUNC_LOG;
+mEnteredSlots |= HeadsetConnected;
+}
+
+void TestRadioEngineWrapper::skipPrevious()
+{
+FUNC_LOG;
+}
+
+void TestRadioEngineWrapper::skipNext()
+{
+FUNC_LOG;
+}
+
+/*!
+ * Destructor
+ */
+TestRadioEngineWrapper::~TestRadioEngineWrapper()
+{
+FUNC_LOG;
+mRadioStubManagerChunk.Close();
+delete mEngineWrapper;
+mEngineWrapper = NULL;
+delete mScheduler;
+mScheduler = NULL;
+}
+
+/*!
+ * called before each testfunction is executed
+ */
+void TestRadioEngineWrapper::init()
+{
+FUNC_LOG;
+}
+
+/*!
+ * called after every testfunction
+ */
+void TestRadioEngineWrapper::cleanup()
+{
+FUNC_LOG;
+}
+
+/*!
+ * called before the first testfunction is executed
+ */
+ void TestRadioEngineWrapper::initTestCase()
+{
+ FUNC_LOG;
+ // Workaround for the below panic, occured after porting to 10.1
+ // Main Panic E32USER-CBase 44
+ // Create and install the active scheduler
+ mScheduler = new(ELeave) CActiveScheduler;
+ CActiveScheduler::Install(mScheduler);
+
+ TInt err = mRadioStubManagerChunk.CreateGlobal(
+ KRadioStubManagerLocalChunkName,
+ sizeof(SRadioStubManager),
+ sizeof(SRadioStubManager),
+ EOwnerThread );
+ QVERIFY2( KErrNone == err, "Creation of memory chunk KRadioStubManagerLocalChunkName failed." );
+ QVERIFY2( sizeof(SRadioStubManager) <= mRadioStubManagerChunk.MaxSize(), "Improper size for memory chunk KRadioStubManagerLocalChunkName." );
+ TUint8* basePtr = mRadioStubManagerChunk.Base();
+ QVERIFY2( 0 != basePtr, "Getting base pointer of memory chunk KRadioStubManagerLocalChunkName failed." );
+ mRadioStubManager = (SRadioStubManager*)basePtr;
+ // Zero configuration/control data
+
+ mRadioStubManager->FillZ();
+ TRAP( err, mSchedulerTimer = CSchedulerStopAndStartTimer::NewL( *this ) );
+ QVERIFY2( KErrNone == err, "CSchedulerStopAndStartTimer not constructed!" );
+ mSchedulerTimer->StartTimer( 1000000, CSchedulerStopAndStartTimer::ETimerIdCreateMUT );
+}
+
+void TestRadioEngineWrapper::testIsEngineConstructed()
+{
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->isEngineConstructed(), "Radio Engine not constructed!" );;
+}
+
+void TestRadioEngineWrapper::testRadioSettingsReference()
+{
+ FUNC_LOG;
+ QVERIFY2( 0 != &mEngineWrapper->settings(), "Settings reference illegal!" );
+}
+
+void TestRadioEngineWrapper::testRegion()
+{
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->region() >= RadioRegion::None, "Illegal Region Id!");
+ QVERIFY2( mEngineWrapper->region() <= RadioRegion::Poland, "Illegal Region Id!");
+ QVERIFY2( mEngineWrapper->frequencyStepSize() != 0, "Region Step Size illegal!" );
+ QVERIFY2( mEngineWrapper->minFrequency() < mEngineWrapper->maxFrequency(), "Region Minimum Frequency illegal!" );
+ QVERIFY2( mEngineWrapper->maxFrequency() > mEngineWrapper->minFrequency(), "Region Maximum Frequency illegal!" );
+ QVERIFY2( mEngineWrapper->isFrequencyValid( mEngineWrapper->minFrequency() + mEngineWrapper->frequencyStepSize() ), "Legal frequency not accepted!" );
+ QVERIFY2( mEngineWrapper->isFrequencyValid( mEngineWrapper->maxFrequency() - mEngineWrapper->frequencyStepSize() ), "Legal frequency not accepted!" );
+ QVERIFY2( mEngineWrapper->isFrequencyValid( mEngineWrapper->minFrequency() ), "Legal minimum frequency not accepted!" );
+ QVERIFY2( mEngineWrapper->isFrequencyValid( mEngineWrapper->maxFrequency() ), "Legal maximum frequency not accepted!" );
+ QVERIFY2( !mEngineWrapper->isFrequencyValid( mEngineWrapper->maxFrequency() + mEngineWrapper->frequencyStepSize() ), "Illegal frequency accepted!" );
+ QVERIFY2( !mEngineWrapper->isFrequencyValid( mEngineWrapper->minFrequency() - mEngineWrapper->frequencyStepSize() ), "Illegal frequency accepted!" );
+ QVERIFY2( !mEngineWrapper->isFrequencyValid( 0 + mEngineWrapper->frequencyStepSize() ), "Illegal frequency accepted!" );
+ QVERIFY2( !mEngineWrapper->isFrequencyValid( 0 - mEngineWrapper->frequencyStepSize() ), "Illegal frequency accepted!" );
+}
+
+void TestRadioEngineWrapper::testRadioOnOff()
+{
+ FUNC_LOG;
+ QVERIFY2( !mEngineWrapper->isRadioOn(), "Radio is not off!" );
+
+ TInt err(KErrNone);
+ TBool antennaAttached = ETrue;
+ QVERIFY2(KErrNone == err, "Attaching property ERadioServPsAntennaStatus failed!" );
+ err = RProperty::Set( KStub_KRadioServerPropertyCategory, ERadioServPsAntennaStatus, antennaAttached );
+ INFO_1("RProperty::Set( KStub_KRadioServerPropertyCategory, ERadioServPsAntennaStatus, antennaAttached ) err: %d", err);
+ QVERIFY2( KErrNone == err, "Setting property ERadioServPsAntennaStatus failed!" );
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->isAntennaAttached(), "Headset/Antenna not connected!");
+ QVERIFY2( mEnteredSlots &= HeadsetConnected, "Headset/Antenna not connected!");
+
+ err = mRadioCR->Set( KRadioCRVisualRadioPowerState, ETrue );
+ QVERIFY2( KErrNone == err, "Setting key KRadioCRVisualRadioPowerState failed!" );
+
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+ //QVERIFY2( !mEngineWrapper->isFrequencyValid( 0 ), "Zero frequency accepted!" );
+}
+
+void TestRadioEngineWrapper::testTuning()
+ {
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+
+ mEngineWrapper->tuneFrequency( mEngineWrapper->minFrequency() );
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->currentFrequency() == mEngineWrapper->minFrequency(), "Tuning to minimum frequency failed!");
+
+ uint freq_A = mEngineWrapper->currentFrequency();
+ mSchedulerTimer->StartTimer( 1000 );
+ tstSetFrequency( freq_A + mEngineWrapper->frequencyStepSize() );
+ mEngineWrapper->startSeeking( Seeking::Up );
+ QVERIFY2( mEnteredSlots &= SeekingStarted, "Seeking upwards not started!");
+ mEnteredSlots &= !SeekingStarted;
+
+ TInt err = mPropertyFrequency.Set( KStub_KRadioServerPropertyCategory, ERadioServPsFrequency, tstGetFrequency() );
+ QVERIFY2( KErrNone == err, "Setting property ERadioServPsFrequency failed!" );
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ QVERIFY2( mEnteredSlots &= TunedToFrequency, "Not Tuned to next upward frequency!");
+ mEnteredSlots &= !TunedToFrequency;
+ uint freq_B = mEngineWrapper->currentFrequency();
+ QVERIFY2( (freq_B - mEngineWrapper->frequencyStepSize()) == freq_A, "Seeking upwards failed!");
+
+
+ tstSetFrequency( mEngineWrapper->maxFrequency() );
+ mEngineWrapper->tuneFrequency( mEngineWrapper->maxFrequency() );
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->currentFrequency() == mEngineWrapper->maxFrequency(), "Current frequency not the maximum one!" );
+
+ mEngineWrapper->startSeeking( Seeking::Down );
+ QVERIFY2( mEnteredSlots &= SeekingStarted, "Seeking downwards not started!");
+ mEnteredSlots &= !SeekingStarted;
+
+ tstSetFrequency( mEngineWrapper->currentFrequency() - (2 * mEngineWrapper->frequencyStepSize()) );
+ err = mPropertyFrequency.Set( KStub_KRadioServerPropertyCategory, ERadioServPsFrequency, tstGetFrequency() );
+ QVERIFY2( KErrNone == err, "Setting property ERadioServPsFrequency failed!" );
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ QVERIFY2( mEnteredSlots &= TunedToFrequency, "Not Tuned to next downward frequency!");
+ mEnteredSlots &= !TunedToFrequency;
+ QVERIFY2( mEngineWrapper->currentFrequency() == mEngineWrapper->maxFrequency()- (2 * mEngineWrapper->frequencyStepSize()), "Seeking downwards failed!");
+
+ mEngineWrapper->tuneFrequency( (mEngineWrapper->maxFrequency() + mEngineWrapper->minFrequency())/2 );
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->currentFrequency() == (mEngineWrapper->maxFrequency() + mEngineWrapper->minFrequency())/2, "Tuning to average frequency failed!");
+
+ uint freq_C = mEngineWrapper->currentFrequency();
+ TUNER.iSetFrequencyError.SetStubError( KRadioServErrFrequencyOutOfBandRange );
+ mEngineWrapper->tuneFrequency( mEngineWrapper->maxFrequency() + mEngineWrapper->frequencyStepSize() );
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ // Should be == not != as now. This is to continue after bug
+ QVERIFY2( mEngineWrapper->currentFrequency() != freq_C, "Tuning over maximum frequency succeeded?");
+ QVERIFY2( !mEngineWrapper->isFrequencyValid( mEngineWrapper->currentFrequency() ), "A frequency over maximum accepted?");
+
+ uint freq_D = mEngineWrapper->currentFrequency();
+ TUNER.iSetFrequencyError.SetStubError( KRadioServErrFrequencyOutOfBandRange );
+ mEngineWrapper->tuneFrequency( mEngineWrapper->minFrequency() - mEngineWrapper->frequencyStepSize() );
+ mSchedulerTimer->StartTimer( 1000000 );
+ // Should be == not != as now. This is to continue after bug
+ QVERIFY2( mEngineWrapper->currentFrequency() != freq_D, "Tuning below minimum frequency succeeded?");
+ QVERIFY2( !mEngineWrapper->isFrequencyValid( mEngineWrapper->currentFrequency() ), "A frequency below minimum accepted?");
+ }
+
+void TestRadioEngineWrapper::testTuningWithDelay()
+ {
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+ uint freq_A = mEngineWrapper->currentFrequency();
+ uint freq_B = mEngineWrapper->currentFrequency();
+ mEngineWrapper->tuneWithDelay( freq_B );
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->currentFrequency() == freq_B, "Tuning with delay failed?");
+ mEngineWrapper->tuneWithDelay( freq_A );
+ mSchedulerTimer->StartTimer( 1000000 );
+ QVERIFY2( mEngineWrapper->currentFrequency() == freq_A, "Tuning with delay failed?");
+ }
+
+void TestRadioEngineWrapper::testMuteToggling()
+ {
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+ TBool muted_1( mEngineWrapper->isMuted() );
+ mEngineWrapper->toggleMute();
+
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ TBool muted_2( mEngineWrapper->isMuted() );
+ QVERIFY2( mEnteredSlots &= MuteChanged, "Mute not changed!");
+ mEnteredSlots &= !MuteChanged;
+ QVERIFY2( muted_1 != muted_2, "Mute() not working!" );
+ mEngineWrapper->toggleMute();
+
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ TBool muted_3( mEngineWrapper->isMuted() );
+ QVERIFY2( mEnteredSlots &= MuteChanged, "Mute not changed!");
+ mEnteredSlots &= !MuteChanged;
+ QVERIFY2( muted_1 == muted_3, "Mute status not changed to original value!") ;
+ }
+
+
+void TestRadioEngineWrapper::testVolumeSetting()
+ {
+ FUNC_LOG;
+ // SetVoliúme(() seems to accept any value. Probably because the real check point
+ // is missing from test constellation.
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+ INFO_1( "mLastRecordedVolume: %i", mLastRecordedVolume );
+ TInt volume_1( 1000 );
+ mEngineWrapper->setVolume( volume_1 );
+
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ INFO_1( "mLastRecordedVolume: %i", mLastRecordedVolume );
+ QVERIFY2( mEnteredSlots &= VolumeChanged, "Volume not changed!");
+ mEnteredSlots &= !VolumeChanged;
+ QVERIFY2( volume_1 == mLastRecordedVolume, "Volume has unexpected value!") ;
+
+ volume_1 = mLastRecordedVolume;
+ TInt volume_2( mLastRecordedVolume * 30 );
+ mEngineWrapper->setVolume( volume_2 );
+
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ INFO_1( "mLastRecordedVolume: %i", mLastRecordedVolume );
+ QVERIFY2( volume_2 == mLastRecordedVolume, "Volume has unexpected value!") ;
+ }
+
+void TestRadioEngineWrapper::testLoudSpeakerUsage()
+ {
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+ TBool isLoudSpeakerUsed( mEngineWrapper->isUsingLoudspeaker() );
+ INFO_1( "isLoudSpeakerUsed: %i", isLoudSpeakerUsed );
+ }
+
+void TestRadioEngineWrapper::testScanning()
+ {
+ FUNC_LOG;
+ QVERIFY2( mEngineWrapper->isRadioOn(), "Radio is not on!" );
+ tstSetScanningData( 10, mEngineWrapper->minFrequency(), mEngineWrapper->frequencyStepSize() );
+ QVERIFY2( TUNER.iScanStations.iCount == 10, "Scanning not initialized!" );
+ mEngineWrapper->scanFrequencyBand();
+ mSchedulerTimer->StartTimer( 1000000 );
+
+ INFO_1( "TUNER.iScanStations.iCount: %i", TUNER.iScanStations.iCount );
+ QVERIFY2( TUNER.iScanStations.iCount == 0, "Scanning not completed!" );
+ }
+
+/*!
+ * called after the last testfunction was executed
+ */
+void TestRadioEngineWrapper::cleanupTestCase()
+{
+ FUNC_LOG;
+ delete mEngineWrapper;
+ mEngineWrapper = NULL;
+
+ //mSchedulerTimer->StartTimer( 1000000, CSchedulerStopAndStartTimer::ETimerIdDeleteMUT );
+
+ delete mScheduler;
+ mScheduler = NULL;
+ mRadioStubManagerChunk.Close();
+ mPropertyPlayerState.Close();
+ mPropertyAntennaStatus.Close();
+ mPropertyOfflineMode.Close();
+ mPropertyTransmitterStatus.Close();
+ mPropertyFrequency.Close();
+ mPropertyFrequencyRange.Close();
+ mPropertyForceMonoReception.Close();
+ mPropertySquelch.Close();
+ mPropertyVolume.Close();
+ mPropertyMuteStatus.Close();
+ mPropertyBalance.Close();
+}
+
+void TestRadioEngineWrapper::tstSetTunerCababilities(uint /*category*/)
+ {
+ FUNC_LOG;
+ TUNER.iCaps.iFrequencyRange = ERsRangeFmEuroAmerica;
+ TUNER.iCaps.iCapabilities =
+ TRsTunerCapabilities::ETunerFunctionAvailableInOfflineMode |
+ TRsTunerCapabilities::ETunerFunctionRds |
+ TRsTunerCapabilities::ETunerFunctionDualTuner;
+ }
+
+void TestRadioEngineWrapper::Timeout( TUint aTimerId )
+ {
+ FUNC_LOG;
+ if ( CSchedulerStopAndStartTimer::ETimerIdCreateMUT == aTimerId )
+ {
+ INFO("ETimerIdCreateMUT elapsed");
+ }
+ else if ( CSchedulerStopAndStartTimer::ETimerIdDeleteMUT == aTimerId )
+ {
+ INFO("ETimerIdDeleteMUT elapsed");
+ }
+ else if ( CSchedulerStopAndStartTimer::ETimerIdRunMUT == aTimerId )
+ {
+ INFO("ETimerIdRunMUT elapsed");
+ }
+ else
+ {
+ INFO("Unknown timer elapsed");
+ }
+ }
+
+void TestRadioEngineWrapper::CreateMUT()
+ {
+ FUNC_LOG;
+ tstDefineAndAttachRadioServerProperties();
+ tstCreateCRObjects();
+ TInt err( KErrNone );
+ TRAP( err, mEngineWrapper = new (ELeave) RadioEngineWrapper( *this, *this ) );
+ QVERIFY2( KErrNone == err, "Radio Engine not constructed!" );
+ tstSetTunerCababilities();
+ }
+
+void TestRadioEngineWrapper::DeleteMUT()
+ {
+ FUNC_LOG;
+ delete mEngineWrapper;
+ mEngineWrapper = NULL;
+ }
+
+void TestRadioEngineWrapper::tstSetFrequency( TUint aFrequency )
+ {
+ FUNC_LOG;
+ TUNER.iFrequency = aFrequency;
+ }
+
+TInt TestRadioEngineWrapper::tstGetFrequency()
+ {
+ FUNC_LOG;
+ return TUNER.iFrequency;
+ }
+
+void TestRadioEngineWrapper::tstSetScanningData( TUint aCount, TInt aMinFreq, TInt aFrequencyStepSize )
+ {
+ FUNC_LOG;
+ TUNER.iScanStations.iCount = aCount;
+ TUNER.iScanStations.iMinFreq = aMinFreq;
+ TUNER.iScanStations.iFrequencyStepSize = aFrequencyStepSize;
+ }
+
+
+void TestRadioEngineWrapper::tstDefineAndAttachRadioServerProperties()
+ {
+ FUNC_LOG;
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsPlayerState, RProperty::EByteArray,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsAntennaStatus, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsOfflineMode, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsTransmitterStatus, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsFrequency, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsFrequencyRange, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsForceMonoReception, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsSquelch, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsVolume, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsMuteStatus, RProperty::EInt,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+ QVERIFY2(KErrNone == RProperty::Define(KStub_KRadioServerPropertyCategory, ERadioServPsBalance, RProperty::EByteArray,
+ KRadioServerReadPolicy, KRadioServerWritePolicy), "Property Define() failed!");
+
+
+ QVERIFY2(KErrNone == mPropertyPlayerState.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsPlayerState ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyAntennaStatus.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsAntennaStatus ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyOfflineMode.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsOfflineMode ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyTransmitterStatus.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsTransmitterStatus ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyFrequency.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsFrequency ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyFrequencyRange.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsFrequencyRange ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyForceMonoReception.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsForceMonoReception ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertySquelch.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsSquelch ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyVolume.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsVolume ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyMuteStatus.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsMuteStatus ), "Property Attach() failed!");
+ QVERIFY2(KErrNone == mPropertyBalance.Attach( KStub_KRadioServerPropertyCategory, ERadioServPsBalance ), "Property Attach() failed!");
+ }
+
+void TestRadioEngineWrapper::tstCreateCRObjects()
+ {
+ TInt err( KErrNone );
+ TRAP( err, mRadioCR = CRepository::NewL(KStub_KRadioCRUid) );
+ QVERIFY2( KErrNone == err, "Radio Central Repository create/open failed!" );
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/src/t_schedulerstartandstoptimer.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,153 @@
+/*
+* 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: Implementation of a timer interface.
+*
+*/
+
+
+
+#include "t_schedulerstartandstoptimer.h"
+#include "trace.h"
+
+
+// ======== LOCAL FUNCTIONS ========
+
+
+// ======== MEMBER FUNCTIONS ========
+
+
+// -----------------------------------------------------------------------------
+// CAccSrvResetInactivityTimeTimer::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CSchedulerStopAndStartTimer* CSchedulerStopAndStartTimer::NewL(
+ MSchedulerStartAndStopTimerObserver& aSchedulerStartAndStopTimerObserver )
+ {
+ FUNC_LOG;
+
+ CSchedulerStopAndStartTimer* self = new ( ELeave ) CSchedulerStopAndStartTimer(
+ aSchedulerStartAndStopTimerObserver );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+
+// Destructor
+CSchedulerStopAndStartTimer::~CSchedulerStopAndStartTimer()
+ {
+ FUNC_LOG;
+ Cancel();
+ }
+
+// -----------------------------------------------------------------------------
+// CSchedulerStopAndStartTimer::StartTimer
+// .
+// -----------------------------------------------------------------------------
+//
+void CSchedulerStopAndStartTimer::StartTimer(
+ TInt aTime,
+ TUint aTimerId )
+ {
+ FUNC_LOG;
+ INFO_2( "Timer Id: %d, Time: %d", aTimerId, aTime)
+ iTime = aTime;
+ iTimerId = aTimerId;
+
+ if ( ETimerIdRunMUT == iTimerId )
+ {
+ After( ( TTimeIntervalMicroSeconds32 ) iTime );
+ }
+ else
+ {
+ After( ( TTimeIntervalMicroSeconds32 ) 1 );
+ }
+ CActiveScheduler::Start();
+ }
+
+// -----------------------------------------------------------------------------
+// CSchedulerStopAndStartTimer::RunL
+//
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+void CSchedulerStopAndStartTimer::RunL()
+ {
+ FUNC_LOG;
+ if ( ETimerIdCreateMUT == iTimerId )
+ {
+ iSchedulerStartAndStopTimerObserver.CreateMUT();
+ iTimerId = ETimerIdRunMUT;
+ After( ( TTimeIntervalMicroSeconds32 ) iTime );
+ }
+ else if ( ETimerIdDeleteMUT == iTimerId )
+ {
+ iSchedulerStartAndStopTimerObserver.DeleteMUT();
+ CActiveScheduler::Stop();
+ }
+ else
+ {
+ CActiveScheduler::Stop();
+ iSchedulerStartAndStopTimerObserver.Timeout( iTimerId );
+ }
+ }
+
+
+// -----------------------------------------------------------------------------
+// CSchedulerStopAndStartTimer::RunError
+// Returns KErrNone
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+TInt CSchedulerStopAndStartTimer::RunError( TInt aError )
+ {
+ FUNC_LOG;
+ // Avoid Panic in CActiveScheduler
+ aError = KErrNone;
+ return aError;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CSchedulerStopAndStartTimer::CSchedulerStopAndStartTimer
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CSchedulerStopAndStartTimer::CSchedulerStopAndStartTimer(
+ MSchedulerStartAndStopTimerObserver& aSchedulerStartAndStopTimerObserver) :
+ CTimer( CActive::EPriorityStandard ),
+ iSchedulerStartAndStopTimerObserver( aSchedulerStartAndStopTimerObserver )
+ {
+ FUNC_LOG;
+ }
+
+// -----------------------------------------------------------------------------
+// CAccSrvProcessCommandTimer::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CSchedulerStopAndStartTimer::ConstructL()
+ {
+ FUNC_LOG;
+ CTimer::ConstructL();
+ CActiveScheduler* AS = CActiveScheduler::Current();
+ CActiveScheduler::Add( this );
+ }
+
+
+// ======== GLOBAL FUNCTIONS ========
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/tsrc/t_radioenginewrapper.pro Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,45 @@
+# Copyright (c) 2010 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 file for radiouiengine's unit tests
+# Description:
+TEMPLATE = app
+TARGET = t_radioenginewrapper
+symbian: {
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
+ TARGET.SID = 0x101FF976 # Tried testUids(0x01000111 and 0x01001005) but failed
+}
+DEPENDPATH += . \
+ inc \
+ src
+INCLUDEPATH += . \
+ ../../../inc \
+ ../inc \
+ ../commoninc \
+ ../../../../inc \
+ /sf/app/radio/radioengine/utils/Stub/inc \
+ /sf/app/radio/radioengine/utils/api \
+ /sf/app/radio/radioengine/utils/inc \
+ /sf/app/radio/radioengine/settings/api \
+ /epoc32/include/internal \
+ /sf/mw/mmmw/mmserv/radioutility/radio_utility/src \
+ /sf/mw/mmmw/mmserv/radioutility/inc \
+ /sf/mw/mmmw/mmserv/inc \
+ /sf/mw/mmmw/inc \
+ /sf/mw/mmmw/mmserv/radioutility/radioserver/inc
+CONFIG += qtestlib
+symbian:LIBS += -lradioenginewrapper_stub
+symbian:LIBS += -lRadioSession_Stub
+symbian:LIBS += -leuser
+symbian:LIBS += -lcentralrepository
+symbian:LIBS += -lflogger
+HEADERS += inc/t_radioenginewrapper.h
+HEADERS += inc\t_schedulerstartandstoptimer.h
+SOURCES += src/t_radioenginewrapper.cpp
+SOURCES += src/t_schedulerstartandstoptimer.cpp
\ No newline at end of file
--- a/radioapp/radiopresetstorage/inc/radiopresetstorage.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiopresetstorage/inc/radiopresetstorage.h Fri Jun 11 13:38:32 2010 +0300
@@ -20,6 +20,7 @@
// System includes
#include <QtGlobal>
+#include <QList>
#include "radiopresetstorageexport.h"
@@ -44,6 +45,7 @@
bool deletePreset( int presetIndex );
bool savePreset( const RadioStationIf& station );
bool readPreset( int index, RadioStationIf& station );
+ void readFrequencies( QList<uint>& frequencyList );
private: // data
--- a/radioapp/radiopresetstorage/inc/radiopresetstorage_p.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiopresetstorage/inc/radiopresetstorage_p.h Fri Jun 11 13:38:32 2010 +0300
@@ -19,28 +19,14 @@
#define RADIOPRESETSTORAGE_P_H_
// System includes
-#ifndef COMPILE_WITH_NEW_PRESET_UTILITY
-# include <RadioPresetUtility.h>
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
-
#include <QScopedPointer>
-#include <e32std.h>
// User includes
// Forward declarations
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
- class CPresetUtility;
- typedef QScopedPointer<CPresetUtility> PresetUtilityPtr;
-#else
- class CRadioFmPresetUtility;
- typedef QScopedPointer<CRadioFmPresetUtility> PresetUtilityPtr;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
+class CPresetUtility;
class RadioPresetStoragePrivate
-#ifndef COMPILE_WITH_NEW_PRESET_UTILITY
- : public MRadioPresetObserver
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
{
public:
@@ -49,14 +35,9 @@
bool init();
-#ifndef COMPILE_WITH_NEW_PRESET_UTILITY
-private:
- void MrpeoPresetChanged( TPresetChangeEvent /*aChange*/, TInt /*aIndex*/ ) {}
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
-
public: // data
- PresetUtilityPtr mPresetUtility;
+ QScopedPointer<CPresetUtility> mPresetUtility;
};
--- a/radioapp/radiopresetstorage/radiopresetstorage.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiopresetstorage/radiopresetstorage.pro Fri Jun 11 13:38:32 2010 +0300
@@ -17,18 +17,16 @@
include(../buildflags.pri)
TEMPLATE = lib
-TARGET = radiopresetstorage
+TARGET = fmradiopresetstorage
CONFIG += dll
DEFINES += BUILD_PRESET_STORAGE_DLL
-INCLUDEPATH += inc
+symbian:TARGET.UID3 = 0x2002EAD9
-COMPILE_WITH_NEW_PRESET_UTILITY {
- INCLUDEPATH += /epoc32/include/newfmpresetutility
- symbian:LIBS += -lpresetutility
-} else {
- symbian:LIBS += -lfmpresetutility
-}
+INCLUDEPATH += inc
+INCLUDEPATH += ../../common
+
+symbian:LIBS += -lpresetutility
DEPENDPATH += $$INCLUDEPATH src
--- a/radioapp/radiopresetstorage/src/radiopresetstorage.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiopresetstorage/src/radiopresetstorage.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -16,13 +16,8 @@
*/
// System includes
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
#include <presetutility.h>
#include <preset.h>
-#else
-# include <RadioFmPresetUtility.h>
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
-
#include <QString>
// User includes
@@ -35,7 +30,7 @@
*/
static QString convertString( const TDesC& aDesc )
{
- return QString( (QChar*)aDesc.Ptr(), aDesc.Length() );
+ return QString::fromUtf16( aDesc.Ptr(), aDesc.Length() );
}
/*!
@@ -62,13 +57,7 @@
int RadioPresetStorage::maxNumberOfPresets() const
{
Q_D( const RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
return d->mPresetUtility->MaxNumberOfPresets();
-#else
- TInt maxPresets = 0;
- d->mPresetUtility->GetMaxNumberOfPresets( maxPresets );
- return maxPresets;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -77,13 +66,7 @@
int RadioPresetStorage::presetCount() const
{
Q_D( const RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
return d->mPresetUtility->PresetCount();
-#else
- TInt presetCount = 0;
- d->mPresetUtility->GetNumberOfPresets( presetCount );
- return presetCount;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -92,16 +75,7 @@
int RadioPresetStorage::firstPreset() const
{
Q_D( const RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
return d->mPresetUtility->FirstPreset();
-#else
- TInt firstIndex = -1;
- TRAPD( err, d->mPresetUtility->GetFirstPresetL( firstIndex ) );
- if ( err ) {
- firstIndex = -1;
- }
- return firstIndex;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -110,16 +84,7 @@
int RadioPresetStorage::nextPreset( int fromIndex ) const
{
Q_D( const RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
return d->mPresetUtility->NextPreset( fromIndex );
-#else
- TInt nextIndex = -1;
- TRAPD( err, d->mPresetUtility->GetNextPresetL( fromIndex, nextIndex ) );
- if ( err ) {
- nextIndex = -1;
- }
- return nextIndex;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -128,12 +93,7 @@
bool RadioPresetStorage::deletePreset( int presetIndex )
{
Q_D( RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
return d->mPresetUtility->DeletePreset( presetIndex ) == KErrNone;
-#else
- TRAPD( err, d->mPresetUtility->DeletePresetL( presetIndex ) );
- return err;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -142,7 +102,6 @@
bool RadioPresetStorage::savePreset( const RadioStationIf& station )
{
Q_D( RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
TPreset preset;
preset.SetFrequency( station.frequency() );
TPresetName name( station.name().utf16() );
@@ -157,11 +116,6 @@
TRAPD( err, d->mPresetUtility->SavePresetL( preset, station.presetIndex() ) );
return err == KErrNone;
-#else
- TFmPresetName name( station.name().utf16() );
- TRAPD( err, d->mPresetUtility->SetPresetL( station.presetIndex(), name, station.frequency() ) );
- return err == KErrNone;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -170,7 +124,6 @@
bool RadioPresetStorage::readPreset( int index, RadioStationIf& station )
{
Q_D( RadioPresetStorage );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
TPreset preset;
TRAPD( err, d->mPresetUtility->ReadPresetL( index, preset ) );
if ( !err ) {
@@ -188,19 +141,25 @@
return true;
}
return false;
-#else
- TFmPresetName nameDesc;
- TInt frequency = 0;
- TRAPD( err, d->mPresetUtility->GetPresetL( index, nameDesc, frequency ) );
- if ( !err )
- {
- station.setPresetIndex( index );
- station.setName( convertString( nameDesc ) );
- station.setFrequency( static_cast<TUint>( frequency ) );
- station.setLocalStation( true );
+}
+
+/*!
+ *
+ */
+void RadioPresetStorage::readFrequencies( QList<uint>& frequencyList )
+{
+ Q_D( RadioPresetStorage );
+
+ TPreset preset;
+ int index = firstPreset();
+ while ( index >= 0 ) {
+ TRAPD( err, d->mPresetUtility->ReadPresetL( index, preset ) );
+ if ( !err ) {
+ frequencyList.append( preset.Frequency() );
+ }
+
+ index = nextPreset( index );
}
- return err == KErrNone;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
}
/*!
@@ -222,11 +181,6 @@
*/
bool RadioPresetStoragePrivate::init()
{
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
TRAPD( err, mPresetUtility.reset( CPresetUtility::NewL() ) );
-
-#else
- TRAPD( err, mPresetUtility.reset( CRadioFmPresetUtility::NewL( *this ) ) );
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
return err == KErrNone;
}
--- a/radioapp/radiouiengine/inc/radiocarouselmodel.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +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 RADIOCAROUSELMODEL_H
-#define RADIOCAROUSELMODEL_H
-
-// System includes
-#include <QAbstractListModel>
-
-// User includes
-#include "radiouiengineexport.h"
-#include "radio_global.h"
-
-// Forward declarations
-class RadioCarouselModelPrivate;
-class RadioUiEngine;
-class RadioStation;
-class RadioStationModel;
-
-class UI_ENGINE_DLL_EXPORT RadioCarouselModel : public QAbstractListModel
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE_D( d_ptr, RadioCarouselModel )
- Q_DISABLE_COPY( RadioCarouselModel )
-
- friend class RadioUiEngine;
- friend class RadioStationModelPrivate;
-
-public:
-
- ~RadioCarouselModel();
-
-// from base class QAbstractListModel
-
- int rowCount( const QModelIndex& parent = QModelIndex() ) const;
- QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-
-// New functions
-
- /*!
- * Finds the closest station from the given frequency
- */
- RadioStation findClosest( const uint frequency, StationSkip::Mode mode );
-
- /*!
- * Returns the model index corresponding to the given frequency
- */
- QModelIndex modelIndexFromFrequency( uint frequency );
-
-private slots:
-
- void removeFrequency( const QModelIndex& parent, int first, int last );
-
-private:
-
- explicit RadioCarouselModel( RadioUiEngine& uiEngine, RadioStationModel& stationModel );
-
-private: // data
-
- /**
- * Unmodifiable pointer to the private implementation
- */
- RadioCarouselModelPrivate* const d_ptr;
-
-};
-
-#endif // RADIOCAROUSELMODEL_H
--- a/radioapp/radiouiengine/inc/radiocarouselmodel_p.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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 RADIOCAROUSELMODEL_P_H
-#define RADIOCAROUSELMODEL_P_H
-
-// System includes
-
-// Forward declarations
-class RadioCarouselModel;
-class RadioUiEngine;
-class RadioStationModel;
-
-class RadioCarouselModelPrivate
-{
-public:
-
- explicit RadioCarouselModelPrivate( RadioCarouselModel* model,
- RadioUiEngine& uiEngine,
- RadioStationModel& stationModel );
-
- ~RadioCarouselModelPrivate();
-
-public: // data
-
- /**
- * Pointer to the public class
- * Not own.
- */
- RadioCarouselModel* q_ptr;
-
- /**
- * Reference to the ui engine
- */
- RadioUiEngine& mUiEngine;
-
- RadioStationModel& mStationModel;
-
-};
-
-#endif // RADIOCAROUSELMODEL_P_H
--- a/radioapp/radiouiengine/inc/radiocontrolservice.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiocontrolservice.h Fri Jun 11 13:38:32 2010 +0300
@@ -19,12 +19,7 @@
#define RADIOCONTROLSERVICE_H
// System includes
-#ifndef BUILD_WIN32
-# include <xqserviceprovider.h>
-#else
-# include <QObject>
-typedef QObject XQServiceProvider;
-#endif
+#include <xqserviceprovider.h>
// User includes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiouiengine/inc/radiogenrelocalizer.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,140 @@
+/*
+* 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: Small helper utility to localize radio genres
+*
+*/
+
+#ifndef RADIOGENRELOCALIZER_H
+#define RADIOGENRELOCALIZER_H
+
+#include "radio_global.h"
+
+// Constants
+
+namespace RadioGenreLocalizer
+{
+
+ struct GenreMap
+ {
+ int mGenreCode;
+ const char* mInCarousel;
+ const char* mInStationsList;
+ const char* mInHomeScreen;
+ };
+
+ static QString genreToString( RadioRegion::Region region, int genre, GenreTarget::Target target );
+}
+
+// Convenience macros to help in the construction of the localization tables
+#define BEGIN_GENRE_MAP(name) const RadioGenreLocalizer::GenreMap name[] = {
+#define EUROPEAN_GENRE(code, inCarousel, inStationsList, inHomescreen ) { GenreEurope::code, inCarousel, inStationsList, inHomescreen }
+#define AMERICAN_GENRE(code, inCarousel, inStationsList, inHomescreen ) { GenreAmerica::code, inCarousel, inStationsList, inHomescreen }
+#define END_GENRE_MAP(name) }; const int name ## Count = sizeof ( name ) / sizeof ( name[0] );
+
+BEGIN_GENRE_MAP( EuropeanGenres )
+ // Genre code // Text in Carousel // Text in Stations list // Text in Homescreen widget
+ EUROPEAN_GENRE( RdsNone, "", "", "" ),
+ EUROPEAN_GENRE( RdsNews, "txt_rad_info_news", "txt_rad_dblist_l1_mhz_val_news", "txt_rad_info_news_hs" ),
+ EUROPEAN_GENRE( RdsCurrentAffairs, "txt_rad_info_current_affairs", "txt_rad_dblist_l1_mhz_val_current_affairs", "txt_rad_info_current_affairs_hs" ),
+ EUROPEAN_GENRE( RdsInformation, "txt_rad_info_information", "txt_rad_dblist_l1_mhz_val_information", "txt_rad_info_information_hs" ),
+ EUROPEAN_GENRE( RdsSport, "txt_rad_info_sport", "txt_rad_dblist_l1_mhz_val_sport", "txt_rad_info_sport_hs" ),
+ EUROPEAN_GENRE( RdsEducation, "txt_rad_info_education", "txt_rad_dblist_l1_mhz_val_education", "txt_rad_info_education_hs" ),
+ EUROPEAN_GENRE( RdsDrama, "txt_rad_info_drama", "txt_rad_dblist_l1_mhz_val_drama", "txt_rad_info_drama_hs" ),
+ EUROPEAN_GENRE( RdsCulture, "txt_rad_info_culture", "txt_rad_dblist_l1_mhz_val_culture", "txt_rad_info_culture_hs" ),
+ EUROPEAN_GENRE( RdsScience, "txt_rad_info_science", "txt_rad_dblist_l1_mhz_val_science", "txt_rad_info_science_hs" ),
+ EUROPEAN_GENRE( RdsVariedSpeech, "txt_rad_info_varied", "txt_rad_dblist_l1_mhz_val_varied", "txt_rad_info_varied_hs" ),
+ EUROPEAN_GENRE( RdsPopMusic, "txt_rad_info_pop_music", "txt_rad_dblist_l1_mhz_val_pop_music", "txt_rad_info_pop_music_hs" ),
+ EUROPEAN_GENRE( RdsRockMusic, "txt_rad_info_rock_music", "txt_rad_dblist_l1_mhz_val_rock_music", "txt_rad_info_rock_music_hs" ),
+ EUROPEAN_GENRE( RdsEasyListening, "txt_rad_info_easy_listening", "txt_rad_dblist_l1_mhz_val_easy_listening", "txt_rad_info_easy_listening_hs" ),
+ EUROPEAN_GENRE( RdsLightClassical, "txt_rad_info_light_classical", "txt_rad_dblist_l1_mhz_val_light_classical", "txt_rad_info_light_classical_hs" ),
+ EUROPEAN_GENRE( RdsSeriousClassical, "txt_rad_info_serious_classical", "txt_rad_dblist_l1_mhz_val_serious_classical", "txt_rad_info_serious_classical_hs" ),
+ EUROPEAN_GENRE( RdsOtherMusic, "txt_rad_info_other_music", "txt_rad_dblist_l1_mhz_val_other_music", "txt_rad_info_other_music_hs" ),
+ EUROPEAN_GENRE( RdsWeather, "txt_rad_info_weather", "txt_rad_dblist_l1_mhz_val_weather", "txt_rad_info_weather_hs" ),
+ EUROPEAN_GENRE( RdsFinance, "txt_rad_info_finance", "txt_rad_dblist_l1_mhz_val_finance", "txt_rad_info_finance_hs" ),
+ EUROPEAN_GENRE( RdsChildrensProgrammes, "txt_rad_info_childrens_programmes", "txt_rad_dblist_l1_mhz_val_childrens_programmes", "txt_rad_info_childrens_programmes_hs" ),
+ EUROPEAN_GENRE( RdsSocialAffairs, "txt_rad_info_social_affairs", "txt_rad_dblist_l1_mhz_val_social_affairs", "txt_rad_info_social_affairs_hs" ),
+ EUROPEAN_GENRE( RdsReligion, "txt_rad_info_religion", "txt_rad_dblist_l1_mhz_val_religion", "txt_rad_info_religion_hs" ),
+ EUROPEAN_GENRE( RdsPhoneIn, "txt_rad_info_phone_in", "txt_rad_dblist_l1_mhz_val_phone_in", "txt_rad_info_phone_in_hs" ),
+ EUROPEAN_GENRE( RdsTravel, "txt_rad_info_travel", "txt_rad_dblist_l1_mhz_val_travel", "txt_rad_info_travel_hs" ),
+ EUROPEAN_GENRE( RdsLeisure, "txt_rad_info_leisure", "txt_rad_dblist_l1_mhz_val_leisure", "txt_rad_info_leisure_hs" ),
+ EUROPEAN_GENRE( RdsJazzMusic, "txt_rad_info_jazz_music", "txt_rad_dblist_l1_mhz_val_jazz_music", "txt_rad_info_jazz_music_hs" ),
+ EUROPEAN_GENRE( RdsCountryMusic, "txt_rad_info_country_music", "txt_rad_dblist_l1_mhz_val_country_music", "txt_rad_info_country_music_hs" ),
+ EUROPEAN_GENRE( RdsNationalMusic, "txt_rad_info_national_music", "txt_rad_dblist_l1_mhz_val_national_music", "txt_rad_info_national_music_hs" ),
+ EUROPEAN_GENRE( RdsOldiesMusic, "txt_rad_info_oldies_music", "txt_rad_dblist_l1_mhz_val_oldies_music", "txt_rad_info_oldies_music_hs" ),
+ EUROPEAN_GENRE( RdsFolkMusic, "txt_rad_info_folk_music", "txt_rad_dblist_l1_mhz_val_folk_music", "txt_rad_info_folk_music_hs" ),
+ EUROPEAN_GENRE( RdsDocumentary, "txt_rad_info_documentary", "txt_rad_dblist_l1_mhz_val_documentary", "txt_rad_info_documentary_hs" ),
+ EUROPEAN_GENRE( RdsAlarmTest, "txt_rad_info_alarm_test", "txt_rad_dblist_l1_mhz_val_alarm_test", "txt_rad_info_alarm_test_hs" ),
+ EUROPEAN_GENRE( RdsAlarm, "txt_rad_info_alarm", "txt_rad_dblist_l1_mhz_val_alarm", "txt_rad_info_alarm_hs" )
+END_GENRE_MAP( EuropeanGenres )
+
+BEGIN_GENRE_MAP( AmericanGenres )
+ // Genre code // Text in Carousel // Text in Stations list // Text in Homescreen widget
+ AMERICAN_GENRE( RbdsNone, "", "", "" ),
+ AMERICAN_GENRE( RbdsNews, "txt_rad_info_news", "txt_rad_dblist_l1_mhz_val_news", "txt_rad_info_news_hs" ),
+ AMERICAN_GENRE( RbdsInformation, "txt_rad_info_information", "txt_rad_dblist_l1_mhz_val_information", "txt_rad_info_information_hs" ),
+ AMERICAN_GENRE( RbdsSports, "txt_rad_info_sport", "txt_rad_dblist_l1_mhz_val_sport", "txt_rad_info_sport_hs" ),
+ AMERICAN_GENRE( RbdsTalk, "txt_rad_info_talk", "txt_rad_dblist_l1_mhz_val_talk", "txt_rad_info_talk_hs" ),
+ AMERICAN_GENRE( RbdsRock, "txt_rad_info_rock_music", "txt_rad_dblist_l1_mhz_val_rock_music", "txt_rad_info_rock_music_hs" ),
+ AMERICAN_GENRE( RbdsClassicRock, "txt_rad_info_classic_rock", "txt_rad_dblist_l1_mhz_val_classic_rock", "txt_rad_info_classic_rock_hs" ),
+ AMERICAN_GENRE( RbdsAdultHits, "txt_rad_info_adult_hits", "txt_rad_dblist_l1_mhz_val_adult_hits", "txt_rad_info_adult_hits_hs" ),
+ AMERICAN_GENRE( RbdsSoftRock, "txt_rad_info_soft_rock", "txt_rad_dblist_l1_mhz_val_soft_rock", "txt_rad_info_soft_rock_hs" ),
+ AMERICAN_GENRE( RbdsTop40, "txt_rad_info_top_40", "txt_rad_dblist_l1_mhz_val_top_40", "txt_rad_info_top_40_hs" ),
+ AMERICAN_GENRE( RbdsCountry, "txt_rad_info_country_music", "txt_rad_dblist_l1_mhz_val_country_music", "txt_rad_info_country_music_hs" ),
+ AMERICAN_GENRE( RbdsOldies, "txt_rad_info_oldies_music", "txt_rad_dblist_l1_mhz_val_oldies_music", "txt_rad_info_oldies_music_hs" ),
+ AMERICAN_GENRE( RbdsSoft, "txt_rad_info_soft", "txt_rad_dblist_l1_mhz_val_soft", "txt_rad_info_soft_hs" ),
+ AMERICAN_GENRE( RbdsNostalgia, "txt_rad_info_nostalgia", "txt_rad_dblist_l1_mhz_val_nostalgia", "txt_rad_info_nostalgia_hs" ),
+ AMERICAN_GENRE( RbdsJazz, "txt_rad_info_jazz_music", "txt_rad_dblist_l1_mhz_val_jazz_music", "txt_rad_info_jazz_music_hs" ),
+ AMERICAN_GENRE( RbdsClassical, "txt_rad_info_classical", "txt_rad_dblist_l1_mhz_val_classical", "txt_rad_info_classical_hs" ),
+ AMERICAN_GENRE( RbdsRhythmAndBlues, "txt_rad_info_rhythm_and_blues", "txt_rad_dblist_l1_mhz_val_rhythm_and_blues", "txt_rad_info_rhythm_and_blues_hs" ),
+ AMERICAN_GENRE( RbdsSoftRhythmAndBlues, "txt_rad_info_soft_rhythm_and_blues", "txt_rad_dblist_l1_mhz_val_soft_rhythm_and_blues", "txt_rad_info_soft_rhythm_and_blues_hs" ),
+ AMERICAN_GENRE( RbdsLanguage, "txt_rad_info_language", "txt_rad_dblist_l1_mhz_val_language", "txt_rad_info_language_hs" ),
+ AMERICAN_GENRE( RbdsReligiousMusic, "txt_rad_info_religious_music", "txt_rad_dblist_l1_mhz_val_religious_music", "txt_rad_info_religious_music_hs" ),
+ AMERICAN_GENRE( RbdsReligiousTalk, "txt_rad_info_religious_talk", "txt_rad_dblist_l1_mhz_val_religious_talk", "txt_rad_info_religious_talk_hs" ),
+ AMERICAN_GENRE( RbdsPersonality, "txt_rad_info_personality", "txt_rad_dblist_l1_mhz_val_personality", "txt_rad_info_personality_hs" ),
+ AMERICAN_GENRE( RbdsPublic, "txt_rad_info_public", "txt_rad_dblist_l1_mhz_val_public", "txt_rad_info_public_hs" ),
+ AMERICAN_GENRE( RbdsCollege, "txt_rad_info_college", "txt_rad_dblist_l1_mhz_val_college", "txt_rad_info_college_hs" ),
+ AMERICAN_GENRE( RbdsUnassigned1, "", "", "" ),
+ AMERICAN_GENRE( RbdsUnassigned2, "", "", "" ),
+ AMERICAN_GENRE( RbdsUnassigned3, "", "", "" ),
+ AMERICAN_GENRE( RbdsUnassigned4, "", "", "" ),
+ AMERICAN_GENRE( RbdsUnassigned5, "", "", "" ),
+ AMERICAN_GENRE( RbdsWeather, "txt_rad_info_weather", "txt_rad_dblist_l1_mhz_val_weather", "txt_rad_info_weather_hs" ),
+ AMERICAN_GENRE( RbdsEmergencyTest, "txt_rad_info_alarm_test", "txt_rad_dblist_l1_mhz_val_alarm_test", "txt_rad_info_alarm_test_hs" ),
+ AMERICAN_GENRE( RbdsEmergency, "txt_rad_info_alarm", "txt_rad_dblist_l1_mhz_val_alarm", "txt_rad_info_alarm_hs" ),
+END_GENRE_MAP( AmericanGenres )
+
+/*!
+ * Function to find the localized text of the given frequency in the given region and target
+ */
+static QString RadioGenreLocalizer::genreToString( RadioRegion::Region region, int genre, GenreTarget::Target target )
+{
+ const RadioGenreLocalizer::GenreMap* genreArray = region == RadioRegion::America ? AmericanGenres : EuropeanGenres;
+ const int genreCount = region == RadioRegion::America ? AmericanGenresCount : EuropeanGenresCount;
+
+ for( int i = 0; i < genreCount; ++i ) {
+ if ( genreArray[i].mGenreCode == genre ) {
+ if ( target == GenreTarget::Carousel ) {
+ return qtTrId( genreArray[i].mInCarousel );
+ } else if ( target == GenreTarget::StationsList ) {
+ return qtTrId( genreArray[i].mInStationsList );
+ } else if ( target == GenreTarget::HomeScreen ) {
+ return qtTrId( genreArray[i].mInHomeScreen );
+ }
+ }
+ }
+
+ return "";
+}
+
+#endif // RADIOGENRELOCALIZER_H
--- a/radioapp/radiouiengine/inc/radiohistorymodel.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiohistorymodel.h Fri Jun 11 13:38:32 2010 +0300
@@ -73,6 +73,8 @@
RadioHistoryItem itemAtIndex( const QModelIndex& index ) const;
+ void removeAll( bool removeTagged );
+
signals:
void itemAdded();
@@ -81,7 +83,6 @@
public slots:
void resetCurrentSong();
- void removeAll();
private:
--- a/radioapp/radiouiengine/inc/radiohistorymodel_p.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiohistorymodel_p.h Fri Jun 11 13:38:32 2010 +0300
@@ -52,7 +52,7 @@
int rowCount() const;
QVariant data( const int row, const int role ) const;
- void removeAll();
+ void removeAll( bool removeTagged );
enum ViewMode{ ShowAll, ShowTagged };
void setViewMode( ViewMode mode );
--- a/radioapp/radiouiengine/inc/radiomonitorservice.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiomonitorservice.h Fri Jun 11 13:38:32 2010 +0300
@@ -20,6 +20,7 @@
// System includes
#include <xqserviceprovider.h>
+#include <QPointer>
// User includes
#include "radioservicedef.h"
@@ -28,6 +29,7 @@
// Forward declarations
class RadioUiEnginePrivate;
class RadioStation;
+class QTimer;
class RadioMonitorService : public XQServiceProvider
, public RadioEngineWrapperObserver
@@ -41,8 +43,6 @@
void init();
- void notifySong( const QString& song );
-
public slots:
void requestNotifications(); // Slot called by Qt Highway
@@ -53,9 +53,10 @@
void notifyRadioStatus();
void notifyFavoriteCount();
void notifyStationChange( const RadioStation& station );
+ void sendNotifications();
private:
-
+
// from base class RadioEngineWrapperObserver
void tunedToFrequency( uint frequency, int reason );
@@ -63,17 +64,24 @@
// New functions
RadioStatus::Status determineRadioStatus() const;
+
+ void checkIfCurrentStationIsFavorite();
+
void notify( const QVariant& notification );
void notifyList( const QVariantList& list );
-
+
private: // data
RadioUiEnginePrivate& mUiEngine;
QList<int> mRequestIndexes;
-
+
RadioStatus::Status mRadioStatus;
+ QVariantList mNotificationList;
+
+ QPointer<QTimer> mNotificationTimer;
+
};
#endif // RADIOMONITORSERVICE_H
--- a/radioapp/radiouiengine/inc/radiomonitorservice_win32.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 RADIOMONITORSERVICE_H
-#define RADIOMONITORSERVICE_H
-
-// System includes
-#include <QObject>
-
-// User includes
-#include "radioservicedef.h"
-
-// Forward declarations
-class RadioUiEnginePrivate;
-
-class RadioMonitorService : public QObject
-{
- Q_OBJECT
-
-public:
-
- RadioMonitorService( RadioUiEnginePrivate& engine );
- virtual ~RadioMonitorService();
-
- void init();
-
- void notifySong( const QString& song );
-
-private:
-
-private: // data
-
- RadioUiEnginePrivate& mUiEngine;
-
-};
-
-#endif // RADIOMONITORSERVICE_H
--- a/radioapp/radiouiengine/inc/radiostation.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiostation.h Fri Jun 11 13:38:32 2010 +0300
@@ -28,13 +28,6 @@
#include "radio_global.h"
// Constants
-const int KLastCallSignCharCode = 25;
-const uint KThreeLetterCallSignCount = 72;
-const uint KKxxxCallSignPiFirst = 0x1000;
-const uint KWxxxCallSignPiFirst = 0x54A8;
-const uint KWxxxCallSignPiLast = 0x994F;
-const uint KxxxCallSignPiFirst = 0x9950;
-const uint KxxxCallSignPiLast = 0x99B9;
// Forward declarations
class RadioStationPrivate;
@@ -157,6 +150,7 @@
int genre() const;
QString frequencyMhz() const;
+ QString nameOrFrequencyMhz() const;
uint frequency() const;
int presetIndex() const;
--- a/radioapp/radiouiengine/inc/radiostationfiltermodel.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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 RADIOSTATIONFILTERMODEL_H_
-#define RADIOSTATIONFILTERMODEL_H_
-
-// System includes
-#include <QSortFilterProxyModel>
-#include <QMap>
-
-// User includes
-#include "radiouiengineexport.h"
-#include "radiostation.h"
-
-// Forward declarations
-class RadioUiEngine;
-
-class UI_ENGINE_DLL_EXPORT RadioStationFilterModel : public QSortFilterProxyModel
-{
-public:
-
- RadioStationFilterModel( RadioUiEngine& uiEngine, QObject* parent = 0 );
-
- ~RadioStationFilterModel();
-
-// from QAbstractItemModel
-
- int rowCount( const QModelIndex& parent = QModelIndex() ) const;
- QModelIndex index( int row, int column,
- const QModelIndex &parent = QModelIndex() ) const;
- QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-
-// New functions
-
- void setTypeFilter( RadioStation::Type filter );
-
- /*!
- * Returns the model index corresponding to the given frequency
- */
- QModelIndex modelIndexFromFrequency( uint frequency );
-
- void setCyclic( bool cyclic );
-
- bool hasLooped( const QModelIndex& index ) const;
-
- QModelIndex realIndex( const QModelIndex& shadowIndex ) const;
-
- bool isEqual( const QModelIndex& first, const QModelIndex& second ) const;
-
-private:
-
-// from base class QSortFilterProxyModel
-
- bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
-
-private: // data
-
- RadioUiEngine& mUiEngine;
-
- RadioStation::Type mFilter;
-
- bool mIsCyclic;
-
- QMap<QModelIndex,QModelIndex> mShadowIndexes;
-
-};
-
-#endif // RADIOSTATIONFILTERMODEL_H_
--- a/radioapp/radiouiengine/inc/radiostationmodel.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiostationmodel.h Fri Jun 11 13:38:32 2010 +0300
@@ -48,12 +48,6 @@
public:
- enum RadioRole
- {
- RadioStationRole = Qt::UserRole + 1,
- ToggleFavoriteRole
- };
-
enum DetailFlag
{
Minimal = 1 << 0,
@@ -104,7 +98,7 @@
/*!
* Functions to find stations by frequency
*/
- bool findFrequency( uint frequency, RadioStation& station );
+ bool findFrequency( uint frequency, RadioStation& station ) const;
/*!
* Functions to find stations by preset index
@@ -118,6 +112,11 @@
RadioStation findClosest( const uint frequency, StationSkip::Mode mode );
/*!
+ * Checks if the model contains the given frequency
+ */
+ bool contains( const uint frequency ) const;
+
+ /*!
* Functions to remove stations
*/
void removeByFrequency( uint frequency );
@@ -168,7 +167,7 @@
/*!
* Returns the model index corresponding to the given frequency
*/
- QModelIndex modelIndexFromFrequency( uint frequency );
+ int indexFromFrequency( uint frequency );
signals:
--- a/radioapp/radiouiengine/inc/radiouiengine.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiouiengine.h Fri Jun 11 13:38:32 2010 +0300
@@ -34,21 +34,9 @@
class RadioStation;
class RadioHistoryModel;
class RadioHistoryItem;
-class RadioCarouselModel;
-class RadioStationFilterModel;
class RadioScannerEngine;
class RadioMonitorService;
-namespace GenreTarget
-{
- enum Target{
- Carousel,
- StationsList,
- HomeScreen
- };
-}
-
-
class UI_ENGINE_DLL_EXPORT RadioUiEngine : public QObject
{
Q_OBJECT
@@ -62,7 +50,6 @@
/**
* Static functions that are used before the ui engine is created
*/
- static bool isOfflineProfile();
static uint lastTunedFrequency();
RadioUiEngine( QObject* parent = 0 );
@@ -73,6 +60,11 @@
bool init();
bool isFirstTimeStart();
+ void setFirstTimeStartPerformed( bool firstTimeStartPerformed );
+
+ void setPowerOn();
+ void setPowerOff( int delay = 0 );
+ bool isPoweringOff() const;
/**
* Getters for things owned by the engine
@@ -80,8 +72,7 @@
RadioSettingsIf& settings();
RadioStationModel& stationModel();
RadioHistoryModel& historyModel();
- RadioStationFilterModel* createNewFilterModel( QObject* parent = 0 );
- RadioCarouselModel* carouselModel();
+ RadioScannerEngine* createScannerEngine();
RadioScannerEngine* scannerEngine();
bool isRadioOn() const;
@@ -111,6 +102,14 @@
enum MusicStore{ OviStore, OtherStore };
void openMusicStore( const RadioHistoryItem& item, MusicStore store = OviStore );
+ void setManualSeekMode( bool manualSeek );
+ bool isInManualSeekMode() const;
+
+ /**
+ * Tunes the radio engine to given frequency
+ */
+ void setFrequency( uint frequency, const int reason = TuneReason::Unspecified );
+
signals:
void tunedToFrequency( uint frequency, int commandSender );
@@ -125,14 +124,9 @@
void audioRouteChanged( bool loudspeaker );
void antennaStatusChanged( bool connected );
-public slots:
+ void powerOffRequested();
- /**
- * Slots to tune to given frequency or preset
- */
- void tuneFrequency( uint frequency, const int reason = TuneReason::Unspecified );
- void tuneWithDelay( uint frequency, const int reason = TuneReason::Unspecified );
- void tunePreset( int presetIndex );
+public slots:
/*!
* volume update command slot for the engine
@@ -151,7 +145,7 @@
* functions used only by the private class to get signals emitted
*/
void emitTunedToFrequency( uint frequency, int commandSender );
- void emitSeekingStarted( Seeking::Direction direction );
+ void emitSeekingStarted( Seek::Direction direction );
void emitRadioStatusChanged( bool radioIsOn );
void emitRdsAvailabilityChanged( bool available );
void emitVolumeChanged( int volume );
--- a/radioapp/radiouiengine/inc/radiouiengine_p.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/inc/radiouiengine_p.h Fri Jun 11 13:38:32 2010 +0300
@@ -31,11 +31,11 @@
class RadioEngineWrapper;
class RadioStationModel;
class RadioHistoryModel;
-class RadioCarouselModel;
class RadioPresetStorage;
class RadioControlService;
class RadioMonitorService;
class RadioScannerEngine;
+class QTimer;
class RadioUiEnginePrivate : public RadioEngineWrapperObserver
{
@@ -62,6 +62,8 @@
void tunedToFrequency( uint frequency, int reason );
void radioStatusChanged( bool radioIsOn );
void rdsAvailabilityChanged( bool available );
+ void increaseVolume();
+ void decreaseVolume();
void volumeChanged( int volume );
void muteChanged( bool muted );
void audioRouteChanged( bool loudspeaker );
@@ -74,7 +76,7 @@
/*!
* Tunes to next or previous station
*/
- uint skip( StationSkip::Mode mode, uint startFrequency = 0 );
+ uint skip( StationSkip::Mode mode, uint startFrequency = 0, const int reason = TuneReason::Skip );
private: // data
@@ -92,16 +94,18 @@
QScopedPointer<RadioHistoryModel> mHistoryModel;
- QScopedPointer<RadioCarouselModel> mCarouselModel;
-
-#ifndef BUILD_WIN32
QScopedPointer<RadioControlService> mControlService;
-#endif
QScopedPointer<RadioMonitorService> mMonitorService;
QPointer<RadioScannerEngine> mScannerEngine;
+ /**
+ * Power off timer
+ * Owned by public class by setting parent
+ */
+ QPointer<QTimer> mPowerOffTimer;
+
};
#endif // RADIOUIENGINE_P_H_
--- a/radioapp/radiouiengine/radiouiengine.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/radiouiengine.pro Fri Jun 11 13:38:32 2010 +0300
@@ -17,32 +17,23 @@
include(../buildflags.pri)
TEMPLATE = lib
-TARGET = radiouiengine
+TARGET = fmradiouiengine
CONFIG += dll
DEFINES += BUILD_UI_ENGINE_DLL
-win32:DESTDIR = ../bin
+
+symbian:TARGET.UID3 = 0x2002EADA
# Wrapper does not depend on QtGui or Orbit
QT = core gui network sql
CONFIG -= hb
-CONFIG += mobility
-MOBILITY = systeminfo
-
-symbian: {
- DEFINES += SYMBIAN
- TARGET.EPOCALLOWDLLDATA = 1
- TARGET.CAPABILITY = CAP_GENERAL_DLL
-}
INCLUDEPATH += inc
INCLUDEPATH += ../radiopresetstorage/inc
INCLUDEPATH += ../radioenginewrapper/inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
-win32:LIBS += -L../bin
-
-LIBS += -lradiopresetstorage
-LIBS += -lradioenginewrapper
+LIBS += -lfmradiopresetstorage
+LIBS += -lfmradioenginewrapper
symbian:LIBS += -lxqservice
symbian:LIBS += -lxqserviceutil
@@ -57,23 +48,19 @@
HEADERS += radiouiengineexport.h
HEADERS += radiostation.h
HEADERS += radiostationmodel.h
-HEADERS += radiostationfiltermodel.h
HEADERS += radiouiengine.h
HEADERS += radiohistoryitem.h
HEADERS += radiohistorymodel.h
-HEADERS += radiocarouselmodel.h
HEADERS += radioscannerengine.h
HEADERS += radioservicedef.h
HEADERS += radionotificationdata.h
-
-symbian:HEADERS += radiocontrolservice.h
-symbian:HEADERS += radiomonitorservice.h
-win32:HEADERS += radiomonitorservice_win32.h
+HEADERS += radiogenrelocalizer.h
+HEADERS += radiocontrolservice.h
+HEADERS += radiomonitorservice.h
INTERNAL_HEADERS += radiostation_p.h
INTERNAL_HEADERS += radiohistoryitem_p.h
INTERNAL_HEADERS += radiohistorymodel_p.h
-INTERNAL_HEADERS += radiocarouselmodel_p.h
INTERNAL_HEADERS += radiouiengine_p.h
INTERNAL_HEADERS += radiostationmodel_p.h
INTERNAL_HEADERS += radioscannerengine_p.h
@@ -84,18 +71,13 @@
SOURCES += radiostation_p.cpp
SOURCES += radiostationmodel.cpp
SOURCES += radiostationmodel_p.cpp
-SOURCES += radiostationfiltermodel.cpp
SOURCES += radiouiengine.cpp
SOURCES += radiouiengine_p.cpp
SOURCES += radiohistoryitem.cpp
SOURCES += radiohistoryitem_p.cpp
SOURCES += radiohistorymodel.cpp
SOURCES += radiohistorymodel_p.cpp
-SOURCES += radiocarouselmodel.cpp
-SOURCES += radiocarouselmodel_p.cpp
SOURCES += radioscannerengine.cpp
SOURCES += radioscannerengine_p.cpp
-
-symbian:SOURCES += radiocontrolservice.cpp
-symbian:SOURCES += radiomonitorservice.cpp
-win32:SOURCES += radiomonitorservice_win32.cpp
+SOURCES += radiocontrolservice.cpp
+SOURCES += radiomonitorservice.cpp
--- a/radioapp/radiouiengine/src/radiocarouselmodel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +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
-
-// User includes
-#include "radiocarouselmodel.h"
-#include "radiocarouselmodel_p.h"
-#include "radiostationmodel.h"
-#include "radiouiengine.h"
-#include "radiostation.h"
-#include "radio_global.h"
-#include "radiologger.h"
-
-/*!
- *
- */
-RadioCarouselModel::RadioCarouselModel( RadioUiEngine& uiEngine, RadioStationModel& stationModel ) :
- QAbstractListModel( &uiEngine ),
- d_ptr( new RadioCarouselModelPrivate( this, uiEngine, stationModel ) )
-{
- connectAndTest( &stationModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
- this, SIGNAL(dataChanged(QModelIndex,QModelIndex)) );
- connectAndTest( &stationModel, SIGNAL(layoutAboutToBeChanged()),
- this, SIGNAL(layoutAboutToBeChanged()) );
- connectAndTest( &stationModel, SIGNAL(layoutChanged()),
- this, SIGNAL(layoutChanged()) );
- connectAndTest( &stationModel, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
- this, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)) );
- connectAndTest( &stationModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SIGNAL(rowsInserted(QModelIndex,int,int)) );
- connectAndTest( &stationModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
- this, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)) );
- connectAndTest( &stationModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SIGNAL(rowsRemoved(QModelIndex,int,int)) );
- connectAndTest( &stationModel, SIGNAL(modelAboutToBeReset()),
- this, SIGNAL(modelAboutToBeReset()) );
- connectAndTest( &stationModel, SIGNAL(modelReset()),
- this, SIGNAL(modelReset()) );
-
-// connectAndTest( model(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-// this, SLOT(removeFrequency(QModelIndex,int,int)) );
-}
-
-/*!
- *
- */
-RadioCarouselModel::~RadioCarouselModel()
-{
- delete d_ptr;
-}
-
-/*!
- * \reimp
- */
-int RadioCarouselModel::rowCount( const QModelIndex& parent ) const
-{
- Q_UNUSED( parent );
- Q_D( const RadioCarouselModel );
- const int rowCount = d->mStationModel.rowCount();
- if ( rowCount == 0 ) {
- return 1;
- }
- return rowCount;
-}
-
-/*!
- * \reimp
- */
-QVariant RadioCarouselModel::data( const QModelIndex& index, int role ) const
-{
- if ( !index.isValid() ) {
- return QVariant();
- }
-
- Q_D( const RadioCarouselModel );
- if ( role == RadioStationModel::RadioStationRole ) {
- const int rowCount = d->mStationModel.rowCount();
- if ( rowCount == 0 ) {
- QVariant variant;
- variant.setValue( d->mStationModel.currentStation() );
- return variant;
- } else {
- return d->mStationModel.data( index, role );
- }
- }
-
- return QVariant();
-}
-
-/*!
- * Finds the closest station from the given frequency
- */
-RadioStation RadioCarouselModel::findClosest( const uint frequency, StationSkip::Mode mode )
-{
- Q_D( RadioCarouselModel );
- return d->mStationModel.findClosest( frequency, mode );
-}
-
-/*!
- * Returns the model index corresponding to the given frequency
- */
-QModelIndex RadioCarouselModel::modelIndexFromFrequency( uint frequency )
-{
- Q_D( RadioCarouselModel );
- if ( d->mStationModel.rowCount() == 0 ) {
- return index( 0, 0 );
- } else {
- RadioStation station;
- if ( d->mStationModel.findFrequency( frequency, station ) ) {
- return index( d->mStationModel.findPresetIndex( station.presetIndex() ), 0 );
- }
- }
-
- return QModelIndex();
-}
-
-/*!
- * \reimp
- */
-void RadioCarouselModel::removeFrequency( const QModelIndex& parent, int first, int last )
-{
- Q_UNUSED( parent );
- Q_UNUSED( first );
- Q_UNUSED( last );
-}
--- a/radioapp/radiouiengine/src/radiocarouselmodel_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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:
-*
-*/
-
-// User includes
-#include "radiocarouselmodel_p.h"
-#include "radiostationmodel.h"
-
-/*!
- *
- */
-RadioCarouselModelPrivate::RadioCarouselModelPrivate( RadioCarouselModel* model,
- RadioUiEngine& uiEngine,
- RadioStationModel& stationModel ) :
- q_ptr( model ),
- mUiEngine( uiEngine ),
- mStationModel( stationModel )
-{
-}
-
-/*!
- *
- */
-RadioCarouselModelPrivate::~RadioCarouselModelPrivate()
-{
-
-}
--- a/radioapp/radiouiengine/src/radiocontrolservice.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiocontrolservice.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -23,11 +23,14 @@
#include "radiouiengine.h"
#include "radioservicedef.h"
+// Constants
+const int SERVICE_POWEROFF_DELAY = 5000;
+
/*!
*
*/
RadioControlService::RadioControlService( RadioUiEngine& engine ) :
- XQServiceProvider( RADIO_CONTROL_SERVICE , &engine ),
+ XQServiceProvider( RADIO_CONTROL_SERVICE, &engine ),
mUiEngine( engine )
{
publishAll();
@@ -48,14 +51,19 @@
*/
void RadioControlService::command( int commandId )
{
+ //TODO: Uncomment when vendor id can be read from the client
+// if ( requestInfo().clientVendorId() != NOKIA_VENDORID ) {
+// return;
+// }
+
switch ( commandId )
{
- case RadioServiceCommand::Play:
- mUiEngine.setMute( false );
+ case RadioServiceCommand::PowerOn:
+ mUiEngine.setPowerOn();
break;
- case RadioServiceCommand::Pause:
- mUiEngine.setMute( true );
+ case RadioServiceCommand::PowerOff:
+ mUiEngine.setPowerOff( SERVICE_POWEROFF_DELAY );
break;
case RadioServiceCommand::Previous:
@@ -67,11 +75,11 @@
break;
case RadioServiceCommand::SeekUp:
- mUiEngine.seekStation( Seeking::Up );
+ mUiEngine.seekStation( Seek::Up );
break;
case RadioServiceCommand::SeekDown:
- mUiEngine.seekStation( Seeking::Down );
+ mUiEngine.seekStation( Seek::Down );
break;
case RadioServiceCommand::Foreground:
@@ -82,6 +90,14 @@
XQServiceUtil::toBackground( true );
break;
+ case RadioServiceCommand::Mute:
+ mUiEngine.setMute( true );
+ break;
+
+ case RadioServiceCommand::UnMute:
+ mUiEngine.setMute( false );
+ break;
+
default:
break;
}
--- a/radioapp/radiouiengine/src/radiohistorymodel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiohistorymodel.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -35,9 +35,9 @@
QAbstractListModel( &uiEngine ),
d_ptr( new RadioHistoryModelPrivate( this, uiEngine ) )
{
- connectAndTest( &uiEngine, SIGNAL(tunedToFrequency(uint,int)),
+ Radio::connect( &uiEngine, SIGNAL(tunedToFrequency(uint,int)),
this, SLOT(resetCurrentSong()) );
- connectAndTest( &uiEngine, SIGNAL(seekingStarted(int)),
+ Radio::connect( &uiEngine, SIGNAL(seekingStarted(int)),
this, SLOT(resetCurrentSong()) );
Q_D( RadioHistoryModel );
@@ -49,7 +49,6 @@
*/
RadioHistoryModel::~RadioHistoryModel()
{
- Q_D( RadioHistoryModel );
delete d_ptr;
}
@@ -87,15 +86,6 @@
}
/*!
- * Public slot
- */
-void RadioHistoryModel::removeAll()
-{
- Q_D( RadioHistoryModel );
- d->removeAll();
-}
-
-/*!
* Sets the icons to be used in the list
*/
void RadioHistoryModel::setIcons( const QIcon& nonTaggedIcon, const QIcon& taggedIcon )
@@ -154,6 +144,15 @@
/*!
*
*/
+void RadioHistoryModel::removeAll( bool removeTagged )
+{
+ Q_D( RadioHistoryModel );
+ d->removeAll( removeTagged );
+}
+
+/*!
+ *
+ */
void RadioHistoryModel::addItem( const QString& artist, const QString& title, const RadioStation& station )
{
Q_D( RadioHistoryModel );
--- a/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -52,7 +52,10 @@
const char* SQL_SELECT_ALL = "SELECT * FROM history ORDER BY id DESC";
const char* SQL_SELECT_TAGGED = "SELECT * FROM history WHERE tagged=1";// ORDER BY id DESC";
-const char* SQL_DELETE_ALL = "DELETE FROM history";
+//const char* SQL_DELETE_ALL = "DELETE FROM history";
+const char* SQL_DELETE_RECENT = "DELETE FROM history WHERE tagged=0";
+//const char* SQL_DELETE_TAGGED = "DELETE FROM history WHERE tagged=1";
+const char* SQL_CLEAR_TAGS = "UPDATE history SET tagged = 0 WHERE tagged = 1";
//static const char* SQL_FIND_ITEM_BY_ID = "SELECT * FROM history WHERE id = ?";
const char* SQL_TOGGLE_TAG = "UPDATE history SET tagged = ? WHERE id = ?";
@@ -79,10 +82,10 @@
RadioUiEngine& uiEngine ) :
q_ptr( model ),
mUiEngine( uiEngine ),
+ mRtItemClass( -1 ),
mTopItemIsPlaying( false ),
mShowDetails( true ),
- mViewMode( ShowAll ),
- mRtItemClass( -1 )
+ mViewMode( ShowAll )
{
}
@@ -222,7 +225,7 @@
/*!
*
*/
-void RadioHistoryModelPrivate::removeAll()
+void RadioHistoryModelPrivate::removeAll( bool removeTagged )
{
if ( !mQueryModel ) {
return;
@@ -230,7 +233,7 @@
QSqlQuery query = beginTransaction();
- query.prepare( SQL_DELETE_ALL );
+ query.prepare( removeTagged ? SQL_CLEAR_TAGS : SQL_DELETE_RECENT );
// Commented out because rowsRemoved() seems to crash HbListView
// commitTransaction( query, RemoveRows, 0, rowCount() - 1 );
--- a/radioapp/radiouiengine/src/radiomonitorservice.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiomonitorservice.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -15,6 +15,9 @@
*
*/
+// System includes
+#include <QTimer>
+
// User includes
#include "radiomonitorservice.h"
#include "radiouiengine.h"
@@ -27,6 +30,9 @@
#include "radionotificationdata.h"
#include "radiologger.h"
+// Constants
+const int NOTIFICATION_DELAY = 200;
+
#define RUN_NOTIFY( type, data ) \
do { \
QVariant variant; \
@@ -40,8 +46,14 @@
RadioMonitorService::RadioMonitorService( RadioUiEnginePrivate& engine ) :
XQServiceProvider( RADIO_MONITOR_SERVICE, &engine.api() ),
mUiEngine( engine ),
- mRadioStatus( RadioStatus::UnSpecified )
+ mRadioStatus( RadioStatus::UnSpecified ),
+ mNotificationTimer( new QTimer( this ) )
{
+ mNotificationTimer->setSingleShot( true );
+ mNotificationTimer->setInterval( NOTIFICATION_DELAY );
+ Radio::connect( mNotificationTimer.data(), SIGNAL(timeout()),
+ this, SLOT(sendNotifications()) );
+
publishAll();
}
@@ -58,21 +70,23 @@
void RadioMonitorService::init()
{
RadioStationModel* stationModel = &mUiEngine.api().stationModel();
- connectAndTest( stationModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ Radio::connect( stationModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(notifyFavoriteCount()) );
- connectAndTest( stationModel, SIGNAL(favoriteChanged(RadioStation)),
+ Radio::connect( stationModel, SIGNAL(favoriteChanged(RadioStation)),
this, SLOT(notifyFavoriteCount()) );
- connectAndTest( stationModel, SIGNAL(stationDataChanged(RadioStation)),
+ Radio::connect( stationModel, SIGNAL(stationDataChanged(RadioStation)),
this, SLOT(notifyStationChange(RadioStation)) );
- connectAndTest( stationModel, SIGNAL(radioTextReceived(RadioStation)),
+ Radio::connect( stationModel, SIGNAL(radioTextReceived(RadioStation)),
this, SLOT(notifyStationChange(RadioStation)) );
RadioUiEngine* uiEngine = &mUiEngine.api();
- connectAndTest( uiEngine, SIGNAL(seekingStarted(int)),
+ Radio::connect( uiEngine, SIGNAL(seekingStarted(int)),
+ this, SLOT(notifyRadioStatus()) );
+ Radio::connect( uiEngine, SIGNAL(muteChanged(bool)),
this, SLOT(notifyRadioStatus()) );
- connectAndTest( uiEngine, SIGNAL(muteChanged(bool)),
+ Radio::connect( uiEngine, SIGNAL(antennaStatusChanged(bool)),
this, SLOT(notifyRadioStatus()) );
- connectAndTest( uiEngine, SIGNAL(antennaStatusChanged(bool)),
+ Radio::connect( uiEngine, SIGNAL(powerOffRequested()),
this, SLOT(notifyRadioStatus()) );
mUiEngine.wrapper().addObserver( this );
@@ -81,20 +95,15 @@
}
/*!
- *
- */
-void RadioMonitorService::notifySong( const QString& song )
-{
- RUN_NOTIFY( Song, song );
-}
-
-/*!
* Public slot
*
*/
void RadioMonitorService::requestNotifications()
{
- mRequestIndexes.append( setCurrentRequestAsync() );
+ //TODO: Uncomment when vendor id can be read from the client
+// if ( requestInfo().clientVendorId() == NOKIA_VENDORID ) {
+ mRequestIndexes.append( setCurrentRequestAsync() );
+// }
}
/*!
@@ -135,14 +144,12 @@
notificationList.append( notification );
}
- if ( !station.url().isEmpty() ) {
- notification.setValue( RadioNotificationData( RadioServiceNotification::HomePage, station.url() ) );
+ if ( !station.dynamicPsText().isEmpty() ) {
+ notification.setValue( RadioNotificationData( RadioServiceNotification::DynamicPS, station.dynamicPsText() ) );
notificationList.append( notification );
}
- //TODO: To be implemented
-// notification.setValue( RadioNotificationData( RadioServiceNotification::Song, ) );
-// notificationList.append( notification );
+ checkIfCurrentStationIsFavorite();
completeRequest( setCurrentRequestAsync(), notificationList );
}
@@ -156,8 +163,10 @@
if ( radioStatus != mRadioStatus ) {
if ( radioStatus == RadioStatus::Seeking ) {
- connectAndTest( mUiEngine.api().scannerEngine(), SIGNAL(destroyed()),
- this, SLOT(notifyRadioStatus()) );
+ if ( RadioScannerEngine* scannerEngine = mUiEngine.api().scannerEngine() ) {
+ Radio::connect( scannerEngine, SIGNAL(destroyed()),
+ this, SLOT(notifyRadioStatus()) );
+ }
}
mRadioStatus = radioStatus;
@@ -173,6 +182,10 @@
{
const int favoriteCount = mUiEngine.api().stationModel().favoriteCount();
RUN_NOTIFY( FavoriteCount, favoriteCount );
+
+ if ( favoriteCount == 1 ) {
+ checkIfCurrentStationIsFavorite();
+ }
}
/*!
@@ -195,13 +208,13 @@
list.append( notification );
}
- if ( station.hasDataChanged( RadioStation::NameChanged ) ) {
- notification.setValue( RadioNotificationData( RadioServiceNotification::Name, station.name() ) );
+ if ( station.hasDataChanged( RadioStation::DynamicPsChanged ) ) {
+ notification.setValue( RadioNotificationData( RadioServiceNotification::DynamicPS, station.dynamicPsText() ) );
list.append( notification );
}
- if ( station.hasDataChanged( RadioStation::UrlChanged ) ) {
- notification.setValue( RadioNotificationData( RadioServiceNotification::HomePage, station.url() ) );
+ if ( station.hasDataChanged( RadioStation::NameChanged ) ) {
+ notification.setValue( RadioNotificationData( RadioServiceNotification::Name, station.name() ) );
list.append( notification );
}
@@ -214,6 +227,16 @@
}
/*!
+ * Private slot
+ *
+ */
+void RadioMonitorService::sendNotifications()
+{
+ notifyList( mNotificationList );
+ mNotificationList.clear();
+}
+
+/*!
* \reimp
*/
void RadioMonitorService::tunedToFrequency( uint frequency, int reason )
@@ -225,6 +248,11 @@
if ( mUiEngine.api().stationModel().findFrequency( frequency, station ) && !station.name().isEmpty() ) {
RUN_NOTIFY( Name, station.name() );
}
+
+ const int favoriteCount = mUiEngine.api().stationModel().favoriteCount();
+ if ( favoriteCount == 1 ) {
+ checkIfCurrentStationIsFavorite();
+ }
}
}
@@ -234,7 +262,9 @@
RadioStatus::Status RadioMonitorService::determineRadioStatus() const
{
RadioUiEngine& uiEngine = mUiEngine.api();
- if ( uiEngine.isScanning() ) {
+ if ( uiEngine.isPoweringOff() ) {
+ return RadioStatus::PoweringOff;
+ } else if ( uiEngine.isScanning() ) {
return RadioStatus::Seeking;
} else if ( !uiEngine.isAntennaAttached() ) {
return RadioStatus::NoAntenna;
@@ -248,11 +278,20 @@
/*!
*
*/
+void RadioMonitorService::checkIfCurrentStationIsFavorite()
+{
+ const bool currentIsFavorite = mUiEngine.api().stationModel().currentStation().isFavorite();
+ RUN_NOTIFY( CurrentIsFavorite, currentIsFavorite );
+}
+
+/*!
+ *
+ */
void RadioMonitorService::notify( const QVariant& notification )
{
- QVariantList list;
- list.append( notification );
- notifyList( list );
+ mNotificationTimer->stop();
+ mNotificationList.append( notification );
+ mNotificationTimer->start();
}
/*!
--- a/radioapp/radiouiengine/src/radiomonitorservice_win32.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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:
-*
-*/
-
-// User includes
-#include "radiomonitorservice_win32.h"
-#include "radiouiengine_p.h"
-#include "radioservicedef.h"
-
-/*!
- *
- */
-RadioMonitorService::RadioMonitorService( RadioUiEnginePrivate& engine ) :
- QObject(),
- mUiEngine( engine )
-{
-}
-
-/*!
- *
- */
-RadioMonitorService::~RadioMonitorService()
-{
-}
-
-/*!
- *
- */
-void RadioMonitorService::init()
-{
-}
-
-/*!
- *
- */
-void RadioMonitorService::notifySong( const QString& song )
-{
- Q_UNUSED( song )
-}
--- a/radioapp/radiouiengine/src/radioscannerengine.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radioscannerengine.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -27,6 +27,7 @@
#include "radiostationhandlerif.h"
#include "radiostationmodel.h"
#include "radiostation.h"
+#include "radiologger.h"
/*!
*
@@ -54,6 +55,8 @@
Q_D( RadioScannerEngine );
d->mUiEngine.cancelSeeking();
+// d->mUiEngine.wrapper().setRdsEnabled( false );
+
d->mIsScanning = true;
if ( !d->mUiEngine.api().isMuted() ) {
@@ -61,17 +64,17 @@
d->mMutedByScanner = true;
}
- d->mUiEngine.api().emitSeekingStarted( Seeking::Up );
+ d->mUiEngine.api().emitSeekingStarted( Seek::Up );
d->mUiEngine.api().stationModel().removeAll( RadioStationModel::RemoveLocalStations );
d->mLastFoundFrequency = d->mUiEngine.api().minFrequency();
if ( d->mUiEngine.wrapper().currentFrequency() == d->mLastFoundFrequency ) {
// Engine was already at the minimun frequency so start scanning
- d->mUiEngine.wrapper().startSeeking( Seeking::Up, TuneReason::StationScan );
+ d->mUiEngine.wrapper().startSeeking( Seek::Up, TuneReason::StationScan );
} else {
// Engine must be initialized to minimum frequency before scanning can start
- d->mUiEngine.wrapper().tuneFrequency( d->mLastFoundFrequency, TuneReason::StationScanInitialization );
+ d->mUiEngine.wrapper().setFrequency( d->mLastFoundFrequency, TuneReason::StationScanInitialization );
}
}
@@ -81,7 +84,7 @@
void RadioScannerEngine::continueScanning()
{
Q_D( RadioScannerEngine );
- d->mUiEngine.wrapper().startSeeking( Seeking::Up, TuneReason::StationScan );
+ d->mUiEngine.wrapper().startSeeking( Seek::Up, TuneReason::StationScan );
}
/*!
@@ -108,6 +111,8 @@
d->mUiEngine.api().setMute( false );
d->mMutedByScanner = false;
}
+
+// d->mUiEngine.wrapper().setRdsEnabled( true );
}
/*!
--- a/radioapp/radiouiengine/src/radioscannerengine_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radioscannerengine_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -59,7 +59,7 @@
Q_Q( RadioScannerEngine );
if ( reason == TuneReason::StationScanInitialization ) {
- mUiEngine.wrapper().startSeeking( Seeking::Up, TuneReason::StationScan );
+ mUiEngine.wrapper().startSeeking( Seek::Up, TuneReason::StationScan );
} else if ( reason == TuneReason::StationScan ) {
if ( frequency > mLastFoundFrequency ) {
// Station has been found normally
@@ -72,6 +72,8 @@
// Seeking looped around the frequency band. Send invalid station as indicator that the scanning should stop
q->emitStationFound( RadioStation() );
}
+ } else {
+ q->emitStationFound( RadioStation() );
}
}
@@ -82,8 +84,13 @@
{
RadioStationModel& stationModel = mUiEngine.api().stationModel();
stationModel.stationHandlerIf().addScannedFrequency( frequency );
+
+ // Return value of findFrequency() is intentionally ignored. The station was just added
+ // to the model in the previous line so it should be found and if it isn't then an
+ // empty station is sent with the signal and scanner will stop the scanning process.
RadioStation station;
stationModel.findFrequency( frequency, station );
+
Q_Q( RadioScannerEngine );
q->emitStationFound( station );
}
--- a/radioapp/radiouiengine/src/radiostation.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiostation.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -25,13 +25,21 @@
#include "radio_global.h"
// Constants
-const QString KTagArtist = "artist";
-const QString KTagTitle = "title";
-const QString KLinkArtist = "<a href=\"" + KTagArtist + "\">";
-const QString KLinkTitle = "<a href=\"" + KTagTitle + "\">";
-const QString KLinkClose = "</a>";
+const QString TAG_ARTIST = "artist";
+const QString TAG_TITLE = "title";
+const QString HTML_ARTIST = "<a href=\"" + TAG_ARTIST + "\">";
+const QString HTML_TITLE = "<a href=\"" + TAG_TITLE + "\">";
+const QString HTML_CLOSE = "</a>";
-const char* callSign[KThreeLetterCallSignCount] =
+const uint LAST_CALLSIGN_CHAR_CODE = 25;
+const uint THREE_LETTER_CALLSIGN_COUNT = 72;
+const uint KXXX_CALLSIGN_PI_FIRST = 0x1000;
+const uint WXXX_CALLSIGN_PI_FIRST = 0x54A8;
+const uint WXXX_CALLSIGN_PI_LAST = 0x994F;
+const uint XXX_CALLSIGN_PI_FIRST = 0x9950;
+const uint XXX_CALLSIGN_PI_LAST = 0x99B9;
+
+const char* CALLSIGN_TABLE[THREE_LETTER_CALLSIGN_COUNT] =
{"KBW", "KCY", "KDB", "KDF", "KEX", "KFH","KFI","KGA","KGB",
"KGO", "KGU", "KGW", "KGY", "KHQ", "KID", "KIT", "KJR", "KLO",
"KLZ", "KMA", "KMJ", "KNX", "KOA", "KOB", "KOY", "KPQ", "KQV",
@@ -41,7 +49,7 @@
"WJW", "WJZ", "WKY", "WLS", "WLW", "WMC", "WMT", "WOC", "WOI",
"WOL", "WOR", "WOW", "WRC", "WRR", "WSB", "WSM", "WWJ", "WWL"};
-const uint piCode[KThreeLetterCallSignCount] =
+const uint PI_CODE_TABLE[THREE_LETTER_CALLSIGN_COUNT] =
{0x99A5, 0x99A6, 0x9990, 0x99A7, 0x9950, 0x9951, 0x9952, 0x9953,
0x9991, 0x9954, 0x9955, 0x9956, 0x9957, 0x99AA, 0x9958, 0x9959,
0x995A, 0x995B, 0x995C, 0x995D, 0x995E, 0x995F, 0x9960, 0x99AB,
@@ -52,9 +60,9 @@
0x997C, 0x997D, 0x997E, 0x999E, 0x999F, 0x9981, 0x99A0, 0x9983,
0x9984, 0x99A1, 0x99B9, 0x99A2, 0x99A3, 0x99A4, 0x9988, 0x9989};
-const uint KDisableLocalAreaCoverageMask = 0x0800;
+const uint DISABLE_LOCAL_AREA_COVERAGE_MASK = 0x0800;
-const int KPsNameChangeThresholdSeconds = 10;
+const int PS_NAME_CHANGE_THRESHOLD_SECONDS = 10;
/**
* Static shared data instance that is used by all default-constructed RadioStation instances
@@ -67,7 +75,7 @@
QString RadioStation::parseFrequency( uint frequency )
{
QString freqString;
- freqString.sprintf( "%.1f", qreal( frequency ) / KFrequencyMultiplier );
+ freqString.sprintf( "%.1f", qreal( frequency ) / FREQUENCY_MULTIPLIER );
return freqString;
}
@@ -179,7 +187,7 @@
QTime previousChange = mData->mLastPsNameChangeTime;
mData->mLastPsNameChangeTime = QTime::currentTime();
if ( previousChange.isValid() && mData->mPsType == RadioStation::Static &&
- previousChange.secsTo( mData->mLastPsNameChangeTime ) < KPsNameChangeThresholdSeconds ) {
+ previousChange.secsTo( mData->mLastPsNameChangeTime ) < PS_NAME_CHANGE_THRESHOLD_SECONDS ) {
LOG( "Station changed PS name too often. PS type changed to Dynamic" );
mData->mPsType = RadioStation::Dynamic;
mData->mDynamicPsText = mData->mName;
@@ -232,7 +240,7 @@
// toggling local area coverage bit code must not be interpreted as new PI code
if( region != RadioRegion::America )
{
- piCode &= ~KDisableLocalAreaCoverageMask;
+ piCode &= ~DISABLE_LOCAL_AREA_COVERAGE_MASK;
}
LOG_FORMAT( "stored PI: %d", mData->mPiCode );
@@ -311,11 +319,11 @@
detach();
QString replacement = "";
if ( rtPlusClass == RtPlus::Artist ) {
- replacement = KLinkArtist;
+ replacement = HTML_ARTIST;
} else if ( rtPlusClass == RtPlus::Title ) {
- replacement = KLinkTitle;
+ replacement = HTML_TITLE;
}
- replacement += rtPlusItem + KLinkClose;
+ replacement += rtPlusItem + HTML_CLOSE;
mData->mRadioText.replace( rtPlusItem, replacement );
mData->mChangeFlags |= RadioStation::RadioTextChanged;
@@ -386,7 +394,18 @@
*/
QString RadioStation::frequencyMhz() const
{
- return parseFrequency( mData->mFrequency );
+ return qtTrId( "txt_rad_list_l1_mhz_big" ).arg( parseFrequency( mData->mFrequency ) );
+}
+
+/*!
+ *
+ */
+QString RadioStation::nameOrFrequencyMhz() const
+{
+ if ( !mData->mName.isEmpty() ) {
+ return mData->mName;
+ }
+ return frequencyMhz();
}
/*!
@@ -576,17 +595,17 @@
LOG_FORMAT( "RadioStation::piCodeToCallSign PI: %d", programmeIdentification );
// call signs beginning with 'K'
- if( ( programmeIdentification>=KKxxxCallSignPiFirst ) && ( programmeIdentification < KWxxxCallSignPiFirst ) ) {
+ if( ( programmeIdentification>=KXXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification < WXXX_CALLSIGN_PI_FIRST ) ) {
callSign += "K";
- callSign += iterateCallSign( KKxxxCallSignPiFirst, programmeIdentification );
+ callSign += iterateCallSign( KXXX_CALLSIGN_PI_FIRST, programmeIdentification );
}
// call signs beginning with 'W'
- else if (( programmeIdentification >= KWxxxCallSignPiFirst ) && ( programmeIdentification <= KWxxxCallSignPiLast )) {
+ else if (( programmeIdentification >= WXXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification <= WXXX_CALLSIGN_PI_LAST )) {
callSign += "W";
- callSign += iterateCallSign( KWxxxCallSignPiFirst, programmeIdentification );
+ callSign += iterateCallSign( WXXX_CALLSIGN_PI_FIRST, programmeIdentification );
}
// 3 letter only call signs
- else if(( programmeIdentification >= KxxxCallSignPiFirst ) && ( programmeIdentification <= KxxxCallSignPiLast)) {
+ else if(( programmeIdentification >= XXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification <= XXX_CALLSIGN_PI_LAST)) {
callSign += callSignString( programmeIdentification );
}
else
@@ -641,9 +660,9 @@
*/
QString RadioStation::callSignString( uint programmeIdentification )
{
- for ( uint i = 0; i < KThreeLetterCallSignCount; ++i ) {
- if( piCode[i] == programmeIdentification ) {
- return callSign[i];
+ for ( uint i = 0; i < THREE_LETTER_CALLSIGN_COUNT; ++i ) {
+ if( PI_CODE_TABLE[i] == programmeIdentification ) {
+ return CALLSIGN_TABLE[i];
}
}
@@ -658,7 +677,7 @@
char RadioStation::callSignChar( uint decimalValue )
{
LOG_FORMAT( "RadioStation::callSignChar A+: %d", decimalValue );
- if ( decimalValue <= KLastCallSignCharCode ) {
+ if ( decimalValue <= LAST_CALLSIGN_CHAR_CODE ) {
return static_cast<char>( 'A' + decimalValue );
}
return '?';
--- a/radioapp/radiouiengine/src/radiostationfiltermodel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +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:
-*
-*/
-
-#include "radiostationfiltermodel.h"
-#include "radiouiengine.h"
-#include "radiostationmodel.h"
-#include "radiologger.h"
-
-#include "radiostation.h" // Remove
-
-/*!
- *
- */
-RadioStationFilterModel::RadioStationFilterModel( RadioUiEngine& uiEngine, QObject* parent ) :
- QSortFilterProxyModel( parent ),
- mUiEngine( uiEngine ),
- mIsCyclic( false )
-{
- setSourceModel( &mUiEngine.stationModel() );
- setDynamicSortFilter( true );
-}
-
-/*!
- *
- */
-RadioStationFilterModel::~RadioStationFilterModel()
-{
-}
-
-/*!
- * \reimp
- */
-int RadioStationFilterModel::rowCount( const QModelIndex& parent ) const
-{
- const int count = QSortFilterProxyModel::rowCount( parent );
- return mIsCyclic ? count * 2 : count;
-}
-
-/*!
- * \reimp
- */
-QModelIndex RadioStationFilterModel::index( int row, int column,
- const QModelIndex &parent ) const
-{
- const int count = QSortFilterProxyModel::rowCount();
- if ( row < count ) {
- return QSortFilterProxyModel::index( row, column, parent );
- } else {
- foreach ( const QModelIndex& shadowIndex, mShadowIndexes.keys() ) {
- if ( shadowIndex.row() == row ) {
- return shadowIndex;
- }
- }
-
- return QModelIndex();
- }
-}
-
-/*!
- * \reimp
- */
-QVariant RadioStationFilterModel::data( const QModelIndex& index, int role ) const
-{
- QModelIndex dataIndex = index;
- if ( mShadowIndexes.contains( index ) ) {
- dataIndex = mShadowIndexes.value( index );
- }
-
- if ( !index.isValid() || !dataIndex.isValid() ) {
- return QVariant();
- }
-
- return QSortFilterProxyModel::data( dataIndex, role );
-}
-
-/*!
- *
- */
-void RadioStationFilterModel::setTypeFilter( RadioStation::Type filter )
-{
- mFilter = filter;
- filterChanged();
-}
-
-/*!
- * Returns the model index corresponding to the given frequency
- */
-QModelIndex RadioStationFilterModel::modelIndexFromFrequency( uint frequency )
-{
- QModelIndex index = static_cast<RadioStationModel*>( sourceModel() )->modelIndexFromFrequency( frequency );
- return mapFromSource( index );
-}
-
-/*!
- *
- */
-void RadioStationFilterModel::setCyclic( bool cyclic )
-{
- mIsCyclic = cyclic;
- if ( mIsCyclic ) {
- const int realCount = QSortFilterProxyModel::rowCount();
- LOG_FORMAT( "Station count: %d", realCount );
- for ( int i = 0; i < realCount; ++i ) {
- QModelIndex realIndex = QSortFilterProxyModel::index( i, 0 );
- QModelIndex shadowIndex = createIndex( i + realCount, 0, realIndex.internalPointer() );
- //const uint freq = realIndex.data( RadioStationModel::RadioStationRole ).value<RadioStation>().frequency();
-// LOG_FORMAT( "Adding shadow index %d for index %d. Freq: %u", shadowIndex.row(), realIndex.row(), freq );
- mShadowIndexes.insert( shadowIndex, realIndex );
- }
- }
-}
-
-/*!
- *
- */
-bool RadioStationFilterModel::hasLooped( const QModelIndex& index ) const
-{
- return mShadowIndexes.contains( index );
-}
-
-/*!
- *
- */
-QModelIndex RadioStationFilterModel::realIndex( const QModelIndex& shadowIndex ) const
-{
- return mShadowIndexes.value( shadowIndex );
-}
-
-/*!
- *
- */
-bool RadioStationFilterModel::isEqual( const QModelIndex& first, const QModelIndex& second ) const
-{
- if ( first == second ) {
- return true;
- }
-
- QModelIndex realFirst = first;
- if ( mShadowIndexes.contains( first ) ) {
- realFirst = mShadowIndexes.value( first );
- }
-
- QModelIndex realSecond = second;
- if ( mShadowIndexes.contains( second ) ) {
- realSecond = mShadowIndexes.value( second );
- }
-
- if ( realFirst == realSecond ) {
- return true;
- }
-
- return false;
-}
-
-/*!
- *
- */
-bool RadioStationFilterModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
-{
- QAbstractItemModel* source = sourceModel();
- QModelIndex index = source->index( sourceRow, 0, sourceParent );
- const RadioStation station = source->data( index, RadioStationModel::RadioStationRole ).value<RadioStation>();
- const bool isType = station.isType( mFilter );
- return isType;
-}
--- a/radioapp/radiouiengine/src/radiostationmodel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiostationmodel.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -18,6 +18,7 @@
// System includes
#include <QStringList>
+// User includes
#include "radiostationmodel.h"
#include "radiostationmodel_p.h"
#include "radiopresetstorage.h"
@@ -112,7 +113,7 @@
}
return firstLine;
- } else if ( role == RadioStationModel::RadioStationRole ) {
+ } else if ( role == RadioRole::RadioStationRole ) {
QVariant variant;
variant.setValue( stationAt( index.row() ) );
return variant;
@@ -129,6 +130,10 @@
list.append( d->mNowPlayingIcon );
}
return list;
+ } else if ( role == RadioRole::IsFavoriteRole ) {
+ QVariant variant;
+ variant.setValue( stationAt( index.row() ).isFavorite() );
+ return variant;
}
return QVariant();
@@ -141,7 +146,7 @@
{
Q_UNUSED( index );
- if ( role == RadioStationModel::ToggleFavoriteRole ) {
+ if ( role == RadioRole::ToggleFavoriteRole ) {
const uint frequency = value.toUInt();
RadioStation station;
if ( findFrequency( frequency, station ) ) {
@@ -164,17 +169,12 @@
Q_D( RadioStationModel );
d->mPresetStorage = storage;
d->mWrapper = wrapper;
- const int presetCount = d->mPresetStorage->presetCount();
+
int index = d->mPresetStorage->firstPreset();
- LOG_FORMAT( "RadioStationModelPrivate::initialize: presetCount: %d, firstIndex: %d", presetCount, index );
+ LOG_FORMAT( "RadioStationModelPrivate::initialize: presetCount: %d, firstIndex: %d",
+ d->mPresetStorage->presetCount(), index );
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
while ( index >= 0 ) {
-#else
- index = 0;
- while ( index < presetCount ) {
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
-
RadioStation station;
station.detach();
@@ -187,9 +187,7 @@
}
}
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
index = d->mPresetStorage->nextPreset( index );
-#endif
}
d->setCurrentStation( d->mWrapper->currentFrequency() );
@@ -233,7 +231,7 @@
// Get the value from the keys list instead of directly accessing the values list
// because QMap may have added a default-constructed value to the values list
Q_D( const RadioStationModel );
- if ( index < d->mStations.keys().count() ) {
+ if ( index >= 0 && index < d->mStations.keys().count() ) {
uint frequency = d->mStations.keys().at( index );
return d->mStations.value( frequency );
}
@@ -243,9 +241,9 @@
/*!
* Finds a station by frequency
*/
-bool RadioStationModel::findFrequency( uint frequency, RadioStation& station )
+bool RadioStationModel::findFrequency( uint frequency, RadioStation& station ) const
{
- Q_D( RadioStationModel );
+ Q_D( const RadioStationModel );
if ( d->mStations.contains( frequency ) ) {
station = d->mStations.value( frequency );
return true;
@@ -293,6 +291,10 @@
const bool findNext = mode == StationSkip::Next || mode == StationSkip::NextFavorite;
QList<RadioStation> list = findFavorite ? d->favorites() : d->mStations.values();
+ if ( list.isEmpty() ) {
+ return RadioStation();
+ }
+
// Find the previous and next station from current frequency
RadioStation previous;
RadioStation next;
@@ -320,6 +322,15 @@
}
/*!
+ * Checks if the model contains the given frequency
+ */
+bool RadioStationModel::contains( const uint frequency ) const
+{
+ RadioStation unused;
+ return findFrequency( frequency, unused );
+}
+
+/*!
* Removes a station by frequency
*/
void RadioStationModel::removeByFrequency( uint frequency )
@@ -361,7 +372,7 @@
// Copy the station to a temporary variable that can be used as signal parameter
RadioStation tempStation = station;
- const int row = modelIndexFromFrequency( tempStation.frequency() ).row();
+ const int row = indexFromFrequency( tempStation.frequency() );
beginRemoveRows( QModelIndex(), row, row );
d->mPresetStorage->deletePreset( tempStation.presetIndex() );
@@ -414,8 +425,6 @@
}
}
}
-
- reset(); // TODO: Remove. this is a workaround to HbGridView update problem
}
/*!
@@ -615,13 +624,13 @@
/*!
* Returns the model index corresponding to the given frequency
*/
-QModelIndex RadioStationModel::modelIndexFromFrequency( uint frequency )
+int RadioStationModel::indexFromFrequency( uint frequency )
{
RadioStation station;
if ( findFrequency( frequency, station ) ) {
- return index( findPresetIndex( station.presetIndex() ), 0 );
+ return findPresetIndex( station.presetIndex() );
}
- return QModelIndex();
+ return -1;
}
/*!
--- a/radioapp/radiouiengine/src/radiostationmodel_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiostationmodel_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -34,7 +34,7 @@
/**
* Timeout period for checking if station is sending dynamic PS in milliseconds
*/
-const int KDynamicPsCheckTimeout = 10 * 1000;
+const int DYNAMIC_PS_CHECK_TIMEOUT = 10 * 1000;
/*!
*
@@ -46,9 +46,9 @@
mCurrentStation( &mManualStation ),
mDynamicPsTimer( new QTimer() )
{
- connectAndTest( mDynamicPsTimer.data(), SIGNAL(timeout()),
+ Radio::connect( mDynamicPsTimer.data(), SIGNAL(timeout()),
q_ptr, SLOT(dynamicPsCheckEnded()) );
- mDynamicPsTimer->setInterval( KDynamicPsCheckTimeout );
+ mDynamicPsTimer->setInterval( DYNAMIC_PS_CHECK_TIMEOUT );
mDynamicPsTimer->setSingleShot( true );
}
@@ -96,6 +96,7 @@
Q_Q( RadioStationModel );
if ( oldStation && oldStation->isValid() ) {
q->emitDataChanged( *oldStation );
+ q->emitDataChanged( *mCurrentStation );
}
}
@@ -310,6 +311,7 @@
if ( persistentSave ) {
const bool success = mPresetStorage->savePreset( *station.data_ptr() );
RADIO_ASSERT( success, "RadioStationModelPrivate::saveStation", "Failed to add station" );
+ Q_UNUSED( success );
}
}
--- a/radioapp/radiouiengine/src/radiouiengine.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiouiengine.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -19,139 +19,31 @@
#include <QScopedPointer>
#include <QProcess>
#include <QFile>
+#include <QTimer>
#ifdef BUILD_WIN32
# include <QSettings>
#else
-# include <qsysteminfo.h>
# include <XQSettingsManager>
-using namespace QtMobility;
#endif // WIN32_BUILD
// User includes
#include "radiouiengine.h"
#include "radiouiengine_p.h"
-#include "radiologger.h"
#include "radioenginewrapper.h"
#include "radiostationmodel.h"
#include "radiohistorymodel.h"
-#include "radiocarouselmodel.h"
#include "radiohistoryitem.h"
#include "radiosettings.h"
-#include "radiostationfiltermodel.h"
#include "radioscannerengine.h"
+#include "radiogenrelocalizer.h"
+#include "radiologger.h"
// Constants
-const QString KPathFormatter = "%1:%2%3";
-const QString KApplicationDir = "\\sys\\bin\\";
-const QString KSongRecognitionApp = "Shazam_0x200265B3.exe";
-const QString KSongRecognitionAppParams = "-listen";
-
const uint DEFAULT_MIN_FREQUENCY = 87500000;
-const uint RADIO_CENREP_UID = 0x101FF976;
-const uint RADIO_CENREP_FREQUENCY_KEY = 0x00000107;
-
-struct GenreStruct
-{
- int mGenreCode;
- const char* mInCarousel;
- const char* mInStationsList;
- const char* mInHomeScreen;
-};
-
-const GenreStruct EuropeanGenres[] =
-{
- { GenreEurope::RdsNone, "", "", "" }
- ,{ GenreEurope::RdsNews, "txt_rad_info_news", "txt_rad_dblist_l1_mhz_val_news", "txt_rad_info_news_hs" }
- ,{ GenreEurope::RdsCurrentAffairs, "txt_rad_info_current_affairs", "txt_rad_dblist_l1_mhz_val_current_affairs", "txt_rad_info_current_affairs_hs" }
- ,{ GenreEurope::RdsInformation, "txt_rad_info_information", "txt_rad_dblist_l1_mhz_val_information", "txt_rad_info_information_hs" }
- ,{ GenreEurope::RdsSport, "txt_rad_info_sport", "txt_rad_dblist_l1_mhz_val_sport", "txt_rad_info_sport_hs" }
- ,{ GenreEurope::RdsEducation, "txt_rad_info_education", "txt_rad_dblist_l1_mhz_val_education", "txt_rad_info_education_hs" }
- ,{ GenreEurope::RdsDrama, "txt_rad_info_drama", "txt_rad_dblist_l1_mhz_val_drama", "txt_rad_info_drama_hs" }
- ,{ GenreEurope::RdsCulture, "txt_rad_info_culture", "txt_rad_dblist_l1_mhz_val_culture", "txt_rad_info_culture_hs" }
- ,{ GenreEurope::RdsScience, "txt_rad_info_science", "txt_rad_dblist_l1_mhz_val_science", "txt_rad_info_science_hs" }
- ,{ GenreEurope::RdsVariedSpeech, "txt_rad_info_varied", "txt_rad_dblist_l1_mhz_val_varied", "txt_rad_info_varied_hs" }
- ,{ GenreEurope::RdsPopMusic, "txt_rad_info_pop_music", "txt_rad_dblist_l1_mhz_val_pop_music", "txt_rad_info_pop_music_hs" }
- ,{ GenreEurope::RdsRockMusic, "txt_rad_info_rock_music", "txt_rad_dblist_l1_mhz_val_rock_music", "txt_rad_info_rock_music_hs" }
- ,{ GenreEurope::RdsEasyListening, "txt_rad_info_easy_listening", "txt_rad_dblist_l1_mhz_val_easy_listening", "txt_rad_info_easy_listening_hs" }
- ,{ GenreEurope::RdsLightClassical, "txt_rad_info_light_classical", "txt_rad_dblist_l1_mhz_val_light_classical", "txt_rad_info_light_classical_hs" }
- ,{ GenreEurope::RdsSeriousClassical, "txt_rad_info_serious_classical", "txt_rad_dblist_l1_mhz_val_serious_classical", "txt_rad_info_serious_classical_hs" }
- ,{ GenreEurope::RdsOtherMusic, "txt_rad_info_other_music", "txt_rad_dblist_l1_mhz_val_other_music", "txt_rad_info_other_music_hs" }
- ,{ GenreEurope::RdsWeather, "txt_rad_info_weather", "txt_rad_dblist_l1_mhz_val_weather", "txt_rad_info_weather_hs" }
- ,{ GenreEurope::RdsFinance, "txt_rad_info_finance", "txt_rad_dblist_l1_mhz_val_finance", "txt_rad_info_finance_hs" }
- ,{ GenreEurope::RdsChildrensProgrammes, "txt_rad_info_childrens_programmes", "txt_rad_dblist_l1_mhz_val_childrens_programmes", "txt_rad_info_childrens_programmes_hs" }
- ,{ GenreEurope::RdsSocialAffairs, "txt_rad_info_social_affairs", "txt_rad_dblist_l1_mhz_val_social_affairs", "txt_rad_info_social_affairs_hs" }
- ,{ GenreEurope::RdsReligion, "txt_rad_info_religion", "txt_rad_dblist_l1_mhz_val_religion", "txt_rad_info_religion_hs" }
- ,{ GenreEurope::RdsPhoneIn, "txt_rad_info_phone_in", "txt_rad_dblist_l1_mhz_val_phone_in", "txt_rad_info_phone_in_hs" }
- ,{ GenreEurope::RdsTravel, "txt_rad_info_travel", "txt_rad_dblist_l1_mhz_val_travel", "txt_rad_info_travel_hs" }
- ,{ GenreEurope::RdsLeisure, "txt_rad_info_leisure", "txt_rad_dblist_l1_mhz_val_leisure", "txt_rad_info_leisure_hs" }
- ,{ GenreEurope::RdsJazzMusic, "txt_rad_info_jazz_music", "txt_rad_dblist_l1_mhz_val_jazz_music", "txt_rad_info_jazz_music_hs" }
- ,{ GenreEurope::RdsCountryMusic, "txt_rad_info_country_music", "txt_rad_dblist_l1_mhz_val_country_music", "txt_rad_info_country_music_hs" }
- ,{ GenreEurope::RdsNationalMusic, "txt_rad_info_national_music", "txt_rad_dblist_l1_mhz_val_national_music", "txt_rad_info_national_music_hs" }
- ,{ GenreEurope::RdsOldiesMusic, "txt_rad_info_oldies_music", "txt_rad_dblist_l1_mhz_val_oldies_music", "txt_rad_info_oldies_music_hs" }
- ,{ GenreEurope::RdsFolkMusic, "txt_rad_info_folk_music", "txt_rad_dblist_l1_mhz_val_folk_music", "txt_rad_info_folk_music_hs" }
- ,{ GenreEurope::RdsDocumentary, "txt_rad_info_documentary", "txt_rad_dblist_l1_mhz_val_documentary", "txt_rad_info_documentary_hs" }
- ,{ GenreEurope::RdsAlarmTest, "txt_rad_info_alarm_test", "txt_rad_dblist_l1_mhz_val_alarm_test", "txt_rad_info_alarm_test_hs" }
- ,{ GenreEurope::RdsAlarm, "txt_rad_info_alarm", "txt_rad_dblist_l1_mhz_val_alarm", "txt_rad_info_alarm_hs" }
-};
-const int EuropeanGenresCount = sizeof( EuropeanGenres ) / sizeof ( EuropeanGenres[0] );
+const uint RADIO_CENREP_UID = 0x2002FF52;
+const uint RADIO_CENREP_FREQUENCY_KEY = 0x207;
-const GenreStruct AmericanGenres[] =
-{
- { GenreAmerica::RbdsNone, "", "", "" }
- ,{ GenreAmerica::RbdsNews, "txt_rad_info_news", "txt_rad_dblist_l1_mhz_val_news", "txt_rad_info_news_hs" }
- ,{ GenreAmerica::RbdsInformation, "txt_rad_info_information", "txt_rad_dblist_l1_mhz_val_information", "txt_rad_info_information_hs" }
- ,{ GenreAmerica::RbdsSports, "txt_rad_info_sport", "txt_rad_dblist_l1_mhz_val_sport", "txt_rad_info_sport_hs" }
- ,{ GenreAmerica::RbdsTalk, "txt_rad_info_talk", "txt_rad_dblist_l1_mhz_val_talk", "txt_rad_info_talk_hs" }
- ,{ GenreAmerica::RbdsRock, "txt_rad_info_rock_music", "txt_rad_dblist_l1_mhz_val_rock_music", "txt_rad_info_rock_music_hs" } //TODO: Check
- ,{ GenreAmerica::RbdsClassicRock, "txt_rad_info_classic_rock", "txt_rad_dblist_l1_mhz_val_classic_rock", "txt_rad_info_classic_rock_hs" }
- ,{ GenreAmerica::RbdsAdultHits, "txt_rad_info_adult_hits", "txt_rad_dblist_l1_mhz_val_adult_hits", "txt_rad_info_adult_hits_hs" }
- ,{ GenreAmerica::RbdsSoftRock, "txt_rad_info_soft_rock", "txt_rad_dblist_l1_mhz_val_soft_rock", "txt_rad_info_soft_rock_hs" }
- ,{ GenreAmerica::RbdsTop40, "txt_rad_info_top_40", "txt_rad_dblist_l1_mhz_val_top_40", "txt_rad_info_top_40_hs" }
- ,{ GenreAmerica::RbdsCountry, "txt_rad_info_country_music", "txt_rad_dblist_l1_mhz_val_country_music", "txt_rad_info_country_music_hs" } //TODO: Check
- ,{ GenreAmerica::RbdsOldies, "txt_rad_info_oldies_music", "txt_rad_dblist_l1_mhz_val_oldies_music", "txt_rad_info_oldies_music_hs" } //TODO: Check
- ,{ GenreAmerica::RbdsSoft, "txt_rad_info_soft", "txt_rad_dblist_l1_mhz_val_soft", "txt_rad_info_soft_hs" }
- ,{ GenreAmerica::RbdsNostalgia, "txt_rad_info_nostalgia", "txt_rad_dblist_l1_mhz_val_nostalgia", "txt_rad_info_nostalgia_hs" }
- ,{ GenreAmerica::RbdsJazz, "txt_rad_info_jazz_music", "txt_rad_dblist_l1_mhz_val_jazz_music", "txt_rad_info_jazz_music_hs" } //TODO: Check
- ,{ GenreAmerica::RbdsClassical, "txt_rad_info_classical", "txt_rad_dblist_l1_mhz_val_classical", "txt_rad_info_classical_hs" }
- ,{ GenreAmerica::RbdsRhythmAndBlues, "txt_rad_info_rhythm_and_blues", "txt_rad_dblist_l1_mhz_val_rhythm_and_blues", "txt_rad_info_rhythm_and_blues_hs" }
- ,{ GenreAmerica::RbdsSoftRhythmAndBlues, "txt_rad_info_soft_rhythm_and_blues", "txt_rad_dblist_l1_mhz_val_soft_rhythm_and_blues", "txt_rad_info_soft_rhythm_and_blues_hs" }
- ,{ GenreAmerica::RbdsLanguage, "txt_rad_info_language", "txt_rad_dblist_l1_mhz_val_language", "txt_rad_info_language_hs" }
- ,{ GenreAmerica::RbdsReligiousMusic, "txt_rad_info_religious_music", "txt_rad_dblist_l1_mhz_val_religious_music", "txt_rad_info_religious_music_hs" }
- ,{ GenreAmerica::RbdsReligiousTalk, "txt_rad_info_religious_talk", "txt_rad_dblist_l1_mhz_val_religious_talk", "txt_rad_info_religious_talk_hs" }
- ,{ GenreAmerica::RbdsPersonality, "txt_rad_info_personality", "txt_rad_dblist_l1_mhz_val_personality", "txt_rad_info_personality_hs" }
- ,{ GenreAmerica::RbdsPublic, "txt_rad_info_public", "txt_rad_dblist_l1_mhz_val_public", "txt_rad_info_public_hs" }
- ,{ GenreAmerica::RbdsCollege, "txt_rad_info_college", "txt_rad_dblist_l1_mhz_val_college", "txt_rad_info_college_hs" }
- ,{ GenreAmerica::RbdsUnassigned1, "", "", "" }
- ,{ GenreAmerica::RbdsUnassigned2, "", "", "" }
- ,{ GenreAmerica::RbdsUnassigned3, "", "", "" }
- ,{ GenreAmerica::RbdsUnassigned4, "", "", "" }
- ,{ GenreAmerica::RbdsUnassigned5, "", "", "" }
- ,{ GenreAmerica::RbdsWeather, "txt_rad_info_weather", "txt_rad_dblist_l1_mhz_val_weather", "txt_rad_info_weather_hs" }//TODO: Check
- ,{ GenreAmerica::RbdsEmergencyTest, "txt_rad_info_alarm_test", "txt_rad_dblist_l1_mhz_val_alarm_test", "txt_rad_info_alarm_test_hs" }//TODO: Check
- ,{ GenreAmerica::RbdsEmergency, "txt_rad_info_alarm", "txt_rad_dblist_l1_mhz_val_alarm", "txt_rad_info_alarm_hs" }//TODO: Check
-};
-const int AmericanGenresCount = sizeof( AmericanGenres ) / sizeof ( AmericanGenres[0] );
-
-/*!
- *
- */
-bool RadioUiEngine::isOfflineProfile()
-{
- bool offline = false;
-
-#ifdef BUILD_WIN32
- QScopedPointer<QSettings> settings( new QSettings( "Nokia", "QtFmRadio" ) );
- offline = settings->value( "Offline", false ).toBool();
-#else
- QSystemDeviceInfo deviceInfo;
- if ( deviceInfo.currentProfile() == QSystemDeviceInfo::OfflineProfile ) {
- offline = true;
- }
-#endif
-
- return offline;
-}
/*!
*
@@ -170,6 +62,9 @@
QScopedPointer<XQSettingsManager> settings( new XQSettingsManager() );
XQSettingsKey key( XQSettingsKey::TargetCentralRepository, RADIO_CENREP_UID, RADIO_CENREP_FREQUENCY_KEY );
frequency = settings->readItemValue( key, XQSettingsManager::TypeInt ).toUInt();
+ if ( frequency == 0 ) {
+ frequency = DEFAULT_MIN_FREQUENCY;
+ }
#endif
return frequency;
@@ -220,6 +115,60 @@
}
/*!
+ *
+ */
+void RadioUiEngine::setFirstTimeStartPerformed( bool firstTimeStartPerformed )
+{
+ Q_D( RadioUiEngine );
+ d->mEngineWrapper->settings().setFirstTimeStartPerformed( firstTimeStartPerformed );
+}
+
+/*!
+ *
+ */
+void RadioUiEngine::setPowerOn()
+{
+ setMute( false );
+
+ Q_D( RadioUiEngine );
+ if ( d->mPowerOffTimer ) {
+ d->mPowerOffTimer->stop();
+ d->mPowerOffTimer->deleteLater();
+ d->mPowerOffTimer = NULL;
+ }
+}
+
+/*!
+ *
+ */
+void RadioUiEngine::setPowerOff( int delay )
+{
+ Q_D( RadioUiEngine );
+ d->mEngineWrapper->setMute( true, false );
+
+ if ( delay > 0 ) {
+ if ( !d->mPowerOffTimer ) {
+ d->mPowerOffTimer = new QTimer( this );
+ Radio::connect( d->mPowerOffTimer, SIGNAL(timeout()),
+ this, SIGNAL(powerOffRequested()) );
+ }
+
+ d->mPowerOffTimer->start( delay );
+ } else {
+ emit powerOffRequested();
+ }
+}
+
+/*!
+ *
+ */
+bool RadioUiEngine::isPoweringOff() const
+{
+ Q_D( const RadioUiEngine );
+ return d->mPowerOffTimer && d->mPowerOffTimer->isActive();
+}
+
+/*!
* Returns the settings handler owned by the engine
*/
RadioSettingsIf& RadioUiEngine::settings()
@@ -247,24 +196,15 @@
}
/*!
- * Creates a new filter model
+ *
*/
-RadioStationFilterModel* RadioUiEngine::createNewFilterModel( QObject* parent )
-{
- return new RadioStationFilterModel( *this, parent );
-}
-
-/*!
- * Creates a new carousel model
- */
-RadioCarouselModel* RadioUiEngine::carouselModel()
+RadioScannerEngine* RadioUiEngine::createScannerEngine()
{
Q_D( RadioUiEngine );
- if ( !d->mCarouselModel ) {
- d->mCarouselModel.reset( new RadioCarouselModel( *this, *d->mStationModel ) );
+ if ( !d->mScannerEngine ) {
+ d->mScannerEngine = new RadioScannerEngine( *d );
}
-
- return d->mCarouselModel.data();
+ return d->mScannerEngine;
}
/*!
@@ -273,10 +213,7 @@
RadioScannerEngine* RadioUiEngine::scannerEngine()
{
Q_D( RadioUiEngine );
- if ( !d->mScannerEngine ) {
- d->mScannerEngine = new RadioScannerEngine( *d );
- }
- return d->mScannerEngine;
+ return d->mScannerEngine.data();
}
/*!
@@ -395,24 +332,7 @@
*/
QString RadioUiEngine::genreToString( int genre, GenreTarget::Target target )
{
- RadioRegion::Region currentRegion = region();
-
- const GenreStruct* genreArray = currentRegion == RadioRegion::America ? AmericanGenres : EuropeanGenres;
- const int genreCount = currentRegion == RadioRegion::America ? AmericanGenresCount : EuropeanGenresCount;
-
- for( int i = 0; i < genreCount; ++i ) {
- if ( genreArray[i].mGenreCode == genre ) {
- if ( target == GenreTarget::Carousel ) {
- return qtTrId( genreArray[i].mInCarousel );
- } else if ( target == GenreTarget::StationsList ) {
- return qtTrId( genreArray[i].mInStationsList );
- } else if ( target == GenreTarget::HomeScreen ) {
- return qtTrId( genreArray[i].mInHomeScreen );
- }
- }
- }
-
- return "";
+ return RadioGenreLocalizer::genreToString( region(), genre, target );
}
/*!
@@ -420,28 +340,8 @@
*/
bool RadioUiEngine::isSongRecognitionAppAvailable()
{
- //TODO: Check if there is a better way to check if an application is available
- bool available = false;
-
- // Check the Z: drive
- QString fullPath = QString( KPathFormatter ).arg( "Z" ).arg( KApplicationDir ).arg( KSongRecognitionApp );
- available = QFile::exists( fullPath );
-
- LOG_FORMAT( "Checking file: %s. found %d", GETSTRING( fullPath ), available );
-
- if ( !available ) {
- // Check the C: drive
- fullPath = QString( KPathFormatter ).arg( "C" ).arg( KApplicationDir ).arg( KSongRecognitionApp );
- available = QFile::exists( fullPath );
- LOG_FORMAT( "Checking file: %s. found %d", GETSTRING( fullPath ), available );
- if ( !available ) {
- // Check the E: drive
- fullPath = QString( KPathFormatter ).arg( "E" ).arg( KApplicationDir ).arg( KSongRecognitionApp );
- available = QFile::exists( fullPath );
- LOG_FORMAT( "Checking file: %s. found %d", GETSTRING( fullPath ), available );
- }
- }
- return available;
+ //TODO: Implement Shazam support
+ return false;
}
/*!
@@ -473,48 +373,33 @@
}
/*!
- * Public slot
- * Tunes to the given frequency
+ * Sets or unsets the engine to manual seek mode
+ */
+void RadioUiEngine::setManualSeekMode( bool manualSeek )
+{
+ Q_D( RadioUiEngine );
+ d->mEngineWrapper->setManualSeekMode( manualSeek );
+}
+
+/*!
+ * Checks if the engine is in manual seek mode
*/
-void RadioUiEngine::tuneFrequency( uint frequency, const int reason )
+bool RadioUiEngine::isInManualSeekMode() const
+{
+ Q_D( const RadioUiEngine );
+ return d->mEngineWrapper->isInManualSeekMode();
+}
+
+/*!
+ * Tunes the radio engine to given frequency
+ */
+void RadioUiEngine::setFrequency( uint frequency, const int reason )
{
Q_D( RadioUiEngine );
if ( frequency != d->mStationModel->currentStation().frequency() && d->mEngineWrapper->isFrequencyValid( frequency ) ) {
LOG_FORMAT( "RadioUiEngine::tuneFrequency, frequency: %d", frequency );
d->cancelSeeking();
- d->mEngineWrapper->tuneFrequency( frequency, reason );
- }
-}
-
-/*!
- * Public slot
- * Tunes to the given frequency after a delay
- */
-void RadioUiEngine::tuneWithDelay( uint frequency, const int reason )
-{
- Q_D( RadioUiEngine );
- if ( frequency != d->mStationModel->currentStation().frequency() && d->mEngineWrapper->isFrequencyValid( frequency ) ) {
- LOG_FORMAT( "RadioEngineWrapperPrivate::tuneWithDelay, frequency: %d", frequency );
- d->cancelSeeking();
- d->mEngineWrapper->tuneWithDelay( frequency, reason );
- }
-}
-
-/*!
- * Public slot
- * Tunes to the given preset
- */
-void RadioUiEngine::tunePreset( int presetIndex )
-{
- Q_D( RadioUiEngine );
- if ( presetIndex != d->mStationModel->currentStation().presetIndex() ) {
- RadioStation station;
- if ( d->mStationModel->findPresetIndex( presetIndex, station ) != RadioStation::NotFound &&
- d->mEngineWrapper->isFrequencyValid( station.frequency() ) ) {
- LOG_FORMAT( "RadioEngineWrapperPrivate::tunePreset, presetIndexPosition: %d", presetIndex );
-
- d->mEngineWrapper->tuneFrequency( station.frequency(), TuneReason::Unspecified );
- }
+ d->mEngineWrapper->setFrequency( frequency, reason );
}
}
@@ -558,7 +443,7 @@
{
if ( isAntennaAttached() ) {
Q_D( RadioUiEngine );
- Seeking::Direction direction = static_cast<Seeking::Direction>( seekDirection );
+ Seek::Direction direction = static_cast<Seek::Direction>( seekDirection );
emitSeekingStarted( direction );
d->mEngineWrapper->startSeeking( direction, TuneReason::Seek );
}
@@ -570,14 +455,7 @@
*/
void RadioUiEngine::launchSongRecognition()
{
- LOG_FORMAT("RadioUiEngine::launchSongRecognition() starting: %s", GETSTRING( KSongRecognitionApp ) );
-
- QStringList arguments;
- arguments << KSongRecognitionAppParams;
-
- bool started = QProcess::startDetached( KSongRecognitionApp, arguments );
- Q_UNUSED( started );
- LOG_ASSERT( started, LOG_FORMAT("RadioUiEngine::launchSongRecognition() failed to start %s", GETSTRING( KSongRecognitionApp ) ) );
+ //TODO: Implement Shazam support
}
/*!
@@ -591,7 +469,7 @@
/*!
* Function used by the private implementation to emit a seekingStarted signal
*/
-void RadioUiEngine::emitSeekingStarted( Seeking::Direction direction )
+void RadioUiEngine::emitSeekingStarted( Seek::Direction direction )
{
emit seekingStarted( direction );
}
--- a/radioapp/radiouiengine/src/radiouiengine_p.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/src/radiouiengine_p.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -32,18 +32,13 @@
#include "radiostationmodel.h"
#include "radiostationmodel_p.h"
#include "radiohistorymodel.h"
-#include "radiocarouselmodel.h"
#include "radiopresetstorage.h"
#include "radiosettings.h"
#include "radiostation.h"
#include "radioscannerengine.h"
#include "radiostationhandlerif.h"
-#ifndef BUILD_WIN32
-# include "radiocontrolservice.h"
-# include "radiomonitorservice.h"
-#else
-# include "radiomonitorservice_win32.h"
-#endif
+#include "radiocontrolservice.h"
+#include "radiomonitorservice.h"
#include "radioservicedef.h"
#include "radiologger.h"
@@ -83,13 +78,16 @@
*/
bool RadioUiEnginePrivate::init()
{
-#ifndef BUILD_WIN32
mControlService.reset( new RadioControlService( *q_ptr ) );
-#endif
mMonitorService.reset( new RadioMonitorService( *this ) );
mStationModel.reset( new RadioStationModel( *this ) );
+
mEngineWrapper.reset( new RadioEngineWrapper( mStationModel->stationHandlerIf() ) );
+ if ( !mEngineWrapper->init() ) {
+ return false;
+ }
mEngineWrapper->addObserver( this );
+
mPresetStorage.reset( new RadioPresetStorage() );
mStationModel->initialize( mPresetStorage.data(), mEngineWrapper.data() );
mHistoryModel.reset( new RadioHistoryModel( *q_ptr ) );
@@ -107,7 +105,7 @@
mMonitorService->init();
- return mEngineWrapper->isEngineConstructed();
+ return true;
}
/*!
@@ -142,33 +140,6 @@
{
Q_Q( RadioUiEngine );
q->emitRadioStatusChanged( radioIsOn );
-
- if ( radioIsOn ) {
- Q_Q( RadioUiEngine );
- QStringList args; // = qApp->arguments();
- if ( args.count() == 2 )
- {
- if ( args.at( 0 ) == "-f" ) // Frequency
- {
- uint frequency = args.at( 1 ).toUInt();
-
- if ( frequency >= mEngineWrapper->minFrequency() && frequency <= mEngineWrapper->maxFrequency() )
- {
- LOG_FORMAT( "RadioApplication::handleArguments, Tuning to frequency: %d", frequency );
- q->tuneFrequency( frequency, 0 );
- }
- }
- else if ( args.at( 0 ) == "-i" ) // Preset index
- {
- int preset = args.at( 1 ).toInt();
- if ( preset > 0 && preset < mStationModel->rowCount() )
- {
- LOG_FORMAT( "RadioApplication::handleArguments, Tuning to preset %d", preset );
- q->tunePreset( preset );
- }
- }
- }
- }
}
/*!
@@ -183,6 +154,32 @@
/*!
*
*/
+void RadioUiEnginePrivate::increaseVolume()
+{
+ Q_Q( RadioUiEngine );
+ if( q->isScanning() ){
+ // volume not changed while scanning
+ } else {
+ mEngineWrapper->increaseVolume();
+ }
+}
+
+/*!
+ *
+ */
+void RadioUiEnginePrivate::decreaseVolume()
+{
+ Q_Q( RadioUiEngine );
+ if( q->isScanning() ) {
+ // volume not changed while scanning
+ } else {
+ mEngineWrapper->decreaseVolume();
+ }
+}
+
+/*!
+ *
+ */
void RadioUiEnginePrivate::volumeChanged( int volume )
{
Q_Q( RadioUiEngine );
@@ -221,7 +218,7 @@
*/
void RadioUiEnginePrivate::skipPrevious()
{
- skip( StationSkip::PreviousFavorite );
+ skip( StationSkip::PreviousFavorite, 0, TuneReason::SkipFromEngine );
}
/*!
@@ -229,23 +226,36 @@
*/
void RadioUiEnginePrivate::skipNext()
{
- skip( StationSkip::NextFavorite );
+ skip( StationSkip::NextFavorite, 0, TuneReason::SkipFromEngine );
}
/*!
* Tunes to next or previous station
*/
-uint RadioUiEnginePrivate::skip( StationSkip::Mode mode, uint startFrequency )
+uint RadioUiEnginePrivate::skip( StationSkip::Mode mode, uint startFrequency, const int reason )
{
LOG_FORMAT( "RadioUiEnginePrivate::skip: mode: %d", mode );
if ( startFrequency == 0 ) {
startFrequency = mEngineWrapper->currentFrequency();
}
- const uint newFrequency = mStationModel->findClosest( startFrequency, mode ).frequency();
+ const int favoriteCount = mStationModel->favoriteCount();
+ if ( favoriteCount < 2 ) {
+ if ( mode == StationSkip::NextFavorite ) {
+ mode = StationSkip::Next;
+ } else if ( mode == StationSkip::PreviousFavorite ) {
+ mode = StationSkip::Previous;
+ }
+ }
- LOG_FORMAT( "RadioUiEnginePrivate::skip. CurrentFreq: %u, tuning to: %u", startFrequency, newFrequency );
- mEngineWrapper->tuneFrequency( newFrequency, TuneReason::Skip );
- return newFrequency;
+ const RadioStation station = mStationModel->findClosest( startFrequency, mode );
+ if ( station.isValid() ) {
+ const uint newFrequency = station.frequency();
+
+ LOG_FORMAT( "RadioUiEnginePrivate::skip. CurrentFreq: %u, tuning to: %u", startFrequency, newFrequency );
+ mEngineWrapper->setFrequency( newFrequency, reason );
+ return newFrequency;
+ }
+ return startFrequency;
}
--- a/radioapp/radiouiengine/tsrc/src/t_radiostation.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/tsrc/src/t_radiostation.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -27,7 +27,7 @@
#include "radiohistorymodel.h"
#include "radioenginewrapper.h"
#include "radiouiengine.h"
-#include "radiologger.h" //connectAndTest
+#include "radiologger.h" //Radio::connect
// Constants
const uint KTestFrequency1 = 89000000;
@@ -180,19 +180,19 @@
mRadioStationModel->removeAll(); //ASSERT: \"last >= first\" in file qabstractitemmodel.cpp, line 2110
}
- connectAndTest( mRadioStationModel, SIGNAL(dataChanged(const QModelIndex, const QModelIndex)),
+ Radio::connect( mRadioStationModel, SIGNAL(dataChanged(const QModelIndex, const QModelIndex)),
this, SLOT(dataChanged(const QModelIndex, const QModelIndex)) );
- connectAndTest( mRadioStationModel, SIGNAL(stationAdded(RadioStation)),
+ Radio::connect( mRadioStationModel, SIGNAL(stationAdded(RadioStation)),
this, SLOT(stationAdded(RadioStation)) );
- connectAndTest( mRadioStationModel, SIGNAL(stationDataChanged(RadioStation)),
+ Radio::connect( mRadioStationModel, SIGNAL(stationDataChanged(RadioStation)),
this, SLOT(stationDataChanged(RadioStation)) );
- connectAndTest( mRadioStationModel, SIGNAL(favoriteChanged(RadioStation)),
+ Radio::connect( mRadioStationModel, SIGNAL(favoriteChanged(RadioStation)),
this, SLOT(favoriteChanged(RadioStation)) );
- connectAndTest( mhistoryModel, SIGNAL(itemAdded()),
+ Radio::connect( mhistoryModel, SIGNAL(itemAdded()),
this, SLOT(itemAdded()) );
}
--- a/radioapp/radiowidgets/inc/radiobannerlabel.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 RADIOBANNERLABEL_H_
-#define RADIOBANNERLABEL_H_
-
-// System includes
-#include <HbLabel>
-
-// User includes
-#include "radiowidgetsexport.h"
-
-class WIDGETS_DLL_EXPORT RadioBannerLabel : public HbLabel
-{
- Q_OBJECT
-
-public:
-
- RadioBannerLabel( QGraphicsItem * parent = 0 );
-
-private:
-
-// from base class QGraphicsItem
-
- void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget );
-
-};
-
-#endif // RADIOBANNERLABEL_H_
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/inc/radiocarouselanimator.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,87 @@
+/*
+* 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 RADIOCAROUSELANIMATOR_H
+#define RADIOCAROUSELANIMATOR_H
+
+// System includes
+#include <QObject>
+
+// User includes
+
+// Forward declarations
+class RadioStationCarousel;
+class QTimeLine;
+class QTimer;
+
+// Class declaration
+class RadioCarouselAnimator : public QObject
+{
+ Q_OBJECT
+
+ enum AnimationFlag
+ {
+ NoAnimation = 0,
+ ScrollingNumbers = 1 << 0,
+ TimerItem = 1 << 1,
+ IconItem = 1 << 2,
+ TextItem = 1 << 3,
+
+ FlashingIcon = TimerItem | IconItem,
+ FlashingText = TimerItem | TextItem
+ };
+ Q_DECLARE_FLAGS( AnimationMode, AnimationFlag )
+
+public:
+
+ RadioCarouselAnimator( RadioStationCarousel& carousel );
+ ~RadioCarouselAnimator();
+
+ void startNumberScroll( const uint startFrequency, const uint stopFrequency );
+
+ void startFlashingIcon();
+ void stopFlashingIcon();
+
+ void startFlashingText();
+ void stopFlashingText();
+
+ void stopAll();
+
+private slots:
+
+ void handleTimeout();
+ void updateNumberScroll( int value );
+ void finalizeNumberScroll();
+
+private:
+
+ void addMode( AnimationMode mode );
+ void removeMode( AnimationMode mode );
+
+private:
+
+ RadioStationCarousel& mCarousel;
+ QTimeLine* mAnimationTimeLine;
+ QTimer* mTimer;
+ bool mCanceled;
+ AnimationMode mMode;
+ bool mStationIsFavorite;
+ bool mFlashingToggle;
+
+};
+
+#endif // RADIOCAROUSELANIMATOR_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/inc/radiocarouselitem.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,99 @@
+/*
+* 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 RADIOCAROUSELITEM_H
+#define RADIOCAROUSELITEM_H
+
+// System includes
+#include <HbWidget>
+#include <QScopedPointer>
+
+// User includes
+
+// Forward declarations
+class RadioStation;
+class RadioFadingLabel;
+class HbPushButton;
+class RadioStation;
+class HbAnchorLayout;
+class RadioStationCarousel;
+
+// Class declaration
+class RadioCarouselItem : public HbWidget
+{
+ friend class RadioStationCarousel;
+
+ class Data;
+
+public:
+
+ RadioCarouselItem( RadioStationCarousel& carousel );
+ ~RadioCarouselItem();
+
+// New functions
+
+ void setStation( const RadioStation& station );
+
+ void swapData( RadioCarouselItem& other );
+
+ uint frequency() const;
+ void update( const RadioStation* station = NULL );
+ void setFrequency( uint frequency );
+ void cleanRdsData();
+ void handleLongPress( const QPointF& coords );
+ void setRadioText( const QString& text );
+
+ void setSeekLayout( bool seekLayout );
+
+ enum ItemVisibility{ AllVisible, AllHidden, IconVisible };
+ void setItemVisibility( ItemVisibility visibility );
+
+ void setIconOpacity( qreal opacity );
+
+private:
+
+ void updateFavoriteIcon( bool isFavorite );
+
+ QString parseFrequency( const uint frequency );
+ QString nameOrFrequency( const RadioStation& station, uint frequency = 0 );
+
+private: // data
+
+ class Data
+ {
+ public:
+ Data();
+ ~Data();
+
+ QScopedPointer<RadioStation> mStation;
+ HbAnchorLayout* mLayout;
+ QScopedPointer<RadioFadingLabel> mNameLabel;
+ QScopedPointer<HbPushButton> mIconButton;
+ QScopedPointer<RadioFadingLabel> mGenreLabel;
+ QScopedPointer<RadioFadingLabel> mRadiotextLabel;
+ QScopedPointer<RadioFadingLabel> mUrlLabel;
+ bool mSeekLayout;
+
+ };
+
+ RadioStationCarousel& mCarousel;
+
+ QScopedPointer<Data> mData;
+
+};
+
+#endif // RADIOCAROUSELITEM_H
--- a/radioapp/radiowidgets/inc/radiofadinglabel.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiofadinglabel.h Fri Jun 11 13:38:32 2010 +0300
@@ -25,7 +25,7 @@
// User includes
#include "radiowidgetsexport.h"
-class WIDGETS_DLL_EXPORT RadioFadingLabel : public HbLabel //TODO: Derive from HbLineEdit
+class WIDGETS_DLL_EXPORT RadioFadingLabel : public HbLabel
{
Q_OBJECT
--- a/radioapp/radiowidgets/inc/radiofrequencyscanner.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiofrequencyscanner.h Fri Jun 11 13:38:32 2010 +0300
@@ -21,6 +21,7 @@
// System includes
#include <QObject>
#include <QScopedPointer>
+#include <QPointer>
// Forward declarations
class HbProgressDialog;
@@ -79,13 +80,15 @@
* Scanning progress note
* Own.
*/
- QScopedPointer<HbProgressDialog> mScanningProgressNote;
+ QPointer<HbProgressDialog> mScanningProgressNote;
int mStripScrollTime;
int mCarouselScrollTime;
bool mIsAlive;
+ bool mUserCanceled;
+
};
#endif // RADIOPRESETSCANNER_H_
--- a/radioapp/radiowidgets/inc/radiofrequencystrip.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiofrequencystrip.h Fri Jun 11 13:38:32 2010 +0300
@@ -21,7 +21,6 @@
// System includes
#include <QMap>
#include <QHash>
-#include <HbIcon>
#include <HbEffect>
#include <QColor>
@@ -37,13 +36,15 @@
class HbPushButton;
class QTimer;
class QModelIndex;
+class RadioUiLoader;
+
+typedef QList<RadioStation> StationList;
// Class declaration
class WIDGETS_DLL_EXPORT RadioFrequencyStrip : public RadioStripBase
{
Q_OBJECT
- Q_PROPERTY( HbIcon leftButtonIcon READ leftButtonIcon WRITE setLeftButtonIcon )
- Q_PROPERTY( HbIcon rightButtonIcon READ rightButtonIcon WRITE setRightButtonIcon )
+ Q_PROPERTY(uint frequency READ frequency)
friend class RadioFrequencyItem;
@@ -51,38 +52,40 @@
RadioFrequencyStrip();
- void setLeftButtonIcon( const HbIcon& leftButtonIcon );
- HbIcon leftButtonIcon() const;
+ void init( RadioUiEngine* engine, RadioUiLoader& uiLoader );
+
+ void setFrequency( const uint frequency, int reason, Scroll::Direction direction = Scroll::Shortest );
+ uint frequency() const;
- void setRightButtonIcon( const HbIcon& rightButtonIcon );
- HbIcon rightButtonIcon() const;
+ bool isInManualSeekMode() const;
+ void cancelManualSeek();
- void init( RadioUiEngine* engine );
+ void addScannedStation( const RadioStation& station );
- void setFrequency( const uint frequency, int reason = 0 );
- uint frequency() const;
+ void updateFavorite( const RadioStation& station );
public slots:
- void updateFavorite( const RadioStation& station );
void setScanningMode( bool isScanning );
signals:
- void frequencyChanged( uint frequency, int reason ); // reason is always CommandSender::RadioFrequencyStrip
+ void frequencyChanged( uint frequency, int reason, int direction );
void skipRequested( int skipMode );
void seekRequested( int seekDirection );
+ void manualSeekChanged( bool manualSeek );
private slots:
+ void removeStation( const QModelIndex& parent, int first, int last );
void updateStation( const QModelIndex& parent, int first, int last );
void initEmptyItems();
void handleLeftButton();
void handleLongLeftButton();
void handleRightButton();
void handleLongRightButton();
- void toggleButtons();
- void checkIllegalPos();
+ void toggleManualSeek();
+ void handleScrollingEnd();
private:
@@ -95,7 +98,7 @@
// from base class QGraphicsWidget
void resizeEvent ( QGraphicsSceneResizeEvent* event );
- void showEvent( QShowEvent* event );
+// void showEvent( QShowEvent* event );
void changeEvent( QEvent* event );
// from base class HbScrollArea
@@ -104,6 +107,10 @@
void mouseReleaseEvent( QGraphicsSceneMouseEvent* event );
void gestureEvent( QGestureEvent* event );
+// from base class QObject
+
+ void timerEvent( QTimerEvent* event );
+
// New functions
void initModel();
@@ -116,9 +123,11 @@
void addFrequencyPos( int pos, uint frequency, RadioFrequencyItem* item );
- void updateFavorites( RadioFrequencyItem* item );
+ void updateStationsInRange( int first, int last, bool stationRemoved = false );
- void updateItems();
+ void updateItem( RadioFrequencyItem* item, uint upperRange = 0, uint ignoredFrequency = 0 );
+
+ void updateAllItems();
QPixmap drawPixmap( uint frequency, QList<RadioStation> stations, RadioFrequencyItem* item );
@@ -126,7 +135,10 @@
int selectorPos() const;
- void scrollToFrequency( uint frequency, int time = 0 );
+ void scrollToFrequency( uint frequency,
+ Scroll::Direction direction = Scroll::Shortest,
+ int time = 0,
+ TuneReason::Reason reason = TuneReason::Unspecified );
void hideButtons();
void showButtons();
@@ -184,18 +196,17 @@
*/
QHash<int,uint> mPositions;
- HbIcon mLeftButtonIcon;
-
- HbIcon mRightButtonIcon;
-
HbPushButton* mLeftButton;
HbPushButton* mRightButton;
- QTimer* mButtonTimer;
- bool mButtonsVisible;
+ QTimer* mManualSeekTimer;
+
+ bool mManualSeekMode;
- bool mUserIsScrolling;
+ uint mLastReportedFrequency;
+
+ int mManualSeekTimerId;
QColor mForegroundColor;
--- a/radioapp/radiowidgets/inc/radiohistoryview.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiohistoryview.h Fri Jun 11 13:38:32 2010 +0300
@@ -24,7 +24,6 @@
// User includes
#include "radioviewbase.h"
-#include "radiowidgetsexport.h"
// Forward declarations
class RadioXmlUiLoader;
@@ -35,7 +34,7 @@
class RadioHistoryItem;
// Class declaration
-class WIDGETS_DLL_EXPORT RadioHistoryView : public RadioViewBase
+class RadioHistoryView : public RadioViewBase
{
Q_OBJECT
Q_PROPERTY(HbIcon nonTaggedIcon READ nonTaggedIcon WRITE setNonTaggedIcon)
@@ -54,10 +53,11 @@
private slots:
- void deckButtonPressed();
+ void updateViewMode();
void clearList();
void updateVisibilities();
void showContextMenu( const QModelIndex& index );
+ void handleLongPress( HbAbstractViewItem* item );
void toggleTagging();
void openOviStore();
void openOtherStore();
--- a/radioapp/radiowidgets/inc/radiomainview.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiomainview.h Fri Jun 11 13:38:32 2010 +0300
@@ -23,7 +23,6 @@
// User includes
#include "radioviewbase.h"
-#include "radiowidgetsexport.h"
// Forward declarations
class RadioWindow;
@@ -33,9 +32,10 @@
class RadioFrequencyScanner;
class RadioStationCarousel;
class RadioFrequencyStrip;
+class RadioStation;
// Class declaration
-class WIDGETS_DLL_EXPORT RadioMainView : public RadioViewBase
+class RadioMainView : public RadioViewBase
{
Q_OBJECT
@@ -46,14 +46,25 @@
void setScanningMode( bool scanning );
+signals:
+
+ void applicationReady();
+
private slots:
- void setFrequencyFromWidget( uint frequency, int reason );
+ void setFrequencyFromWidget( uint frequency, int reason, int direction );
void setFrequencyFromEngine( uint frequency, int reason );
void skip( int skipMode );
+ void openStationsView();
void toggleScanning();
void seekingStarted();
+ void updateAntennaStatus( bool connected );
void updateAudioRoute( bool loudspeaker );
+ void setManualSeekMode( bool manualSeekActive );
+ void handleFavoriteChange( const RadioStation& station );
+
+ void toggleSkippingMode(); //TODO: Remove. Temporary test code
+ void resetFirstTimeCount(); //TODO: Remove. Temporary test code
private:
@@ -63,12 +74,19 @@
void setOrientation();
void userAccepted();
+// from base class QObject
+
+ bool eventFilter( QObject* watched, QEvent* event );
+
private: // data
QScopedPointer<RadioFrequencyScanner> mFrequencyScanner;
RadioStationCarousel* mCarousel;
RadioFrequencyStrip* mFrequencyStrip;
+ HbAction* mSkippingAction; //TODO: Remove. Temporary test code
+ bool mAlternateSkipping; //TODO: Remove. Temporary test code
+
};
#endif // RADIOMAINVIEW_H
--- a/radioapp/radiowidgets/inc/radiostationcarousel.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiostationcarousel.h Fri Jun 11 13:38:32 2010 +0300
@@ -19,10 +19,9 @@
#define RADIOSTATIONCAROUSEL_H
// System includes
-#include <HbGridView>
-#include <QMap>
-#include <QAbstractItemModel>
+#include <HbScrollArea>
#include <HbIcon>
+#include <QPointer>
// User includes
#include "radiowidgetsexport.h"
@@ -31,12 +30,11 @@
// Forward declarations
class RadioUiEngine;
class RadioUiLoader;
+class RadioCarouselItem;
class RadioStation;
-class RadioStationItem;
+class RadioStationModel;
class RadioStationCarousel;
-class RadioCarouselModel;
-class RadioFadingLabel;
-class QTimeLine;
+class RadioCarouselAnimator;
class HbLabel;
namespace CarouselInfoText
@@ -46,61 +44,39 @@
None,
ConnectAntenna,
NoFavorites,
+ FavoriteIconHint,
Seeking,
- Scanning
+ Scanning,
+ ManualSeek
};
}
// Class declaration
-class ScanningHelper : public QObject
-{
- Q_OBJECT
-
-public:
-
- ScanningHelper( RadioStationCarousel& carousel );
-
- void start();
-
-private slots:
-
- void startSlide();
- void startNumberScroll();
- void numberScrollUpdate( int value );
-
-public:
-
- RadioStationCarousel& mCarousel;
- uint mCurrentFrequency;
- uint mPreviousFrequency;
- RadioStationItem* mStationItem;
- QTimeLine* mNumberScrollingTimeLine;
- QModelIndex mModelIndex;
-
-};
-
-// Class declaration
-class WIDGETS_DLL_EXPORT RadioStationCarousel : public HbGridView
+class WIDGETS_DLL_EXPORT RadioStationCarousel : public HbScrollArea
{
Q_OBJECT
Q_PROPERTY(HbIcon favoriteIcon READ favoriteIcon WRITE setFavoriteIcon)
Q_PROPERTY(HbIcon nonFavoriteIcon READ nonFavoriteIcon WRITE setNonFavoriteIcon)
Q_PROPERTY( int autoScrollTime READ autoScrollTime WRITE setAutoScrollTime )
- friend class ScanningHelper;
+ friend class RadioCarouselAnimator;
+ friend class RadioCarouselItem;
public:
enum ScrollFlag
{
- Default = 0,
- NoAnim = 1 << 0,
- NoSignal = 1 << 1,
- UpdateItem = 1 << 2
+ Default = 0,
+ NoAnim = 1 << 0,
+ NoSignal = 1 << 1,
+ IgnoreCenter = 1 << 2,
+ UpdateItem = 1 << 3,
+ FromPanGesture = 1 << 4,
+ FromSwipeGesture = 1 << 5
};
Q_DECLARE_FLAGS( ScrollMode, ScrollFlag )
- RadioStationCarousel( RadioUiEngine* uiEngine = 0 );
+ RadioStationCarousel( QGraphicsItem* parent = 0 );
void setFavoriteIcon( const HbIcon& favoriteIcon );
HbIcon favoriteIcon() const;
@@ -113,9 +89,7 @@
void init( RadioUiLoader& uiLoader, RadioUiEngine* uiEngine );
- void setCarouselModel( RadioCarouselModel* carouselModel );
-
- void setFrequency( uint frequency, int reason );
+ void setFrequency( uint frequency, int reason, Scroll::Direction direction = Scroll::Shortest );
RadioUiEngine* uiEngine();
@@ -126,18 +100,20 @@
void cleanRdsData();
- void updateCurrentItem();
-
void animateNewStation( const RadioStation& station );
-
- void setItemVisible( bool visible );
+ void cancelAnimation();
void setInfoText( CarouselInfoText::Type type );
void clearInfoText();
+ void setManualSeekMode( bool manualSeekActive );
+
+ void setAlternateSkippingMode( bool alternateSkipping ); //TODO: Remove this! This is test code
+
signals:
- void frequencyChanged( uint frequency, int reason );
+ void frequencyChanged( uint frequency, int reason, int direction );
+ void skipRequested( int skipMode );
void scanAnimationFinished();
public slots:
@@ -146,14 +122,14 @@
private slots:
+ void scrollPosChanged( const QPointF& newPosition );
+ void adjustAfterScroll();
void update( const RadioStation& station );
void updateRadioText( const RadioStation& station );
- void insertFrequency( const QModelIndex& parent, int first, int last );
- void prepareToRemoveFrequency( const QModelIndex& parent, int first, int last );
- void removeFrequency( const QModelIndex& parent, int first, int last );
- void updateFrequencies();
+ void updateStations();
void timerFired();
- void openContextMenu( HbAbstractViewItem* item, const QPointF& coords );
+ void toggleFavorite();
+// void openContextMenu( HbAbstractViewItem* item, const QPointF& coords );
#ifdef USE_DEBUGGING_CONTROLS
void setRdsAvailable( bool available );
@@ -164,59 +140,78 @@
// from base class QGraphicsItem
void mousePressEvent( QGraphicsSceneMouseEvent* event );
-
+ void resizeEvent( QGraphicsSceneResizeEvent* event );
+ void showEvent( QShowEvent* event );
void gestureEvent( QGestureEvent* event );
// New functions
- void initToLastTunedFrequency();
+ bool isInitialized() const;
+
+ void setCenterIndex( int index, ScrollMode mode = Default );
- void updateClampingStyle();
+ void scrollToIndex( int index, Scroll::Direction direction = Scroll::Shortest,
+ ScrollMode mode = Default );
- void initCurrentStationItem();
+ int calculateDifference( int targetIndex, Scroll::Direction& direction );
- RadioStationItem* currentStationItem();
+ bool isScrollingAllowed() const;
- RadioCarouselModel* carouselModel() const;
+ void adjustPos( int offset );
- void scrollToIndex( const QModelIndex& index, ScrollMode mode = Default );
+ int trimIndex( int index );
- void updatePos( int offset );
+ int prevIndex( int index );
+ int nextIndex( int index );
void skip( StationSkip::Mode mode );
private: // data
- enum TimerMode { NoTimer, RtPlusCheck, InfoText };
+ enum TimerMode { NoTimer, SetFrequency, RtPlusCheck, InfoText, FavoriteHintShow, FavoriteHintHide };
+
+ RadioUiEngine* mUiEngine;
- RadioUiEngine* mUiEngine;
+ int mAutoScrollTime;
- bool mAntennaAttached;
+ HbIcon mFavoriteIcon;
+ HbIcon mNonFavoriteIcon;
- int mAutoScrollTime;
+ QTimer* mGenericTimer;
+ TimerMode mTimerMode;
+
+ QString mRadioTextHolder;
- QMap<uint,QModelIndex> mModelIndexes;
+ QPointer<RadioCarouselAnimator> mAnimator;
- HbIcon mFavoriteIcon;
- HbIcon mNonFavoriteIcon;
+ HbLabel* mInfoText;
+
+ HbWidget* mContainer;
- QTimer* mGenericTimer;
- TimerMode mTimerMode;
+ enum CarouselItem { LeftItem, CenterItem, RightItem };
+ RadioCarouselItem* mItems[3];
- QString mRadioTextHolder;
+ int mMidScrollPos;
+ int mMaxScrollPos;
- ScanningHelper* mScanningHelper;
+ int mCurrentIndex;
+ int mTargetIndex;
+ bool mIsCustomFreq;
- HbLabel* mInfoText;
+ CarouselInfoText::Type mInfoTextType;
- RadioStationItem* mCurrentItem;
+ RadioStationModel* mModel;
+
+ bool mPosAdjustmentDisabled;
- CarouselInfoText::Type mInfoTextType;
+ Scroll::Direction mScrollDirection;
- int mPanStartPos;
+ bool mManualSeekMode;
+
+ bool mAlternateSkipping;
#ifdef USE_DEBUGGING_CONTROLS
- RadioFadingLabel* mRdsLabel;
+ RadioFadingLabel* mRdsLabel;
#endif
};
--- a/radioapp/radiowidgets/inc/radiostationitem.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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 RADIOSTATIONITEM_H
-#define RADIOSTATIONITEM_H
-
-// System includes
-#include <HbAbstractViewItem>
-
-// Forward declarations
-class RadioFadingLabel;
-class HbPushButton;
-class RadioStation;
-class HbAnchorLayout;
-class RadioStationCarousel;
-
-// Class declaration
-class RadioStationItem : public HbAbstractViewItem
-{
- Q_OBJECT
- friend class RadioStationCarousel;
-
-public:
-
- RadioStationItem( RadioStationCarousel& carousel );
-
-// From base class HbAbstractViewItem
-
- HbAbstractViewItem* createItem();
- void updateChildItems();
-
-// New functions
-
- uint frequency() const;
- void update( const RadioStation* station = 0 );
- void setFrequency( uint frequency );
- void cleanRdsData();
- void handleLongPress( const QPointF& coords );
-
-private slots:
-
- void toggleFavorite();
-
-private:
-
- void updateFavoriteIcon( bool isFavorite );
-
- RadioStationCarousel* carousel();
-
- QString parseFrequency( const uint frequency );
- QString nameOrFrequency( const RadioStation& station, uint frequency = 0 );
-
-private: // data
-
- RadioStationCarousel& mCarousel;
- HbAnchorLayout* mLayout;
- RadioFadingLabel* mNameLabel;
- HbPushButton* mIconButton;
- RadioFadingLabel* mGenreLabel;
- RadioFadingLabel* mRadiotextLabel;
- RadioFadingLabel* mUrlLabel;
- uint mFrequency;
-};
-
-
-#endif // RADIOSTATIONITEM_H
--- a/radioapp/radiowidgets/inc/radiostationsview.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiostationsview.h Fri Jun 11 13:38:32 2010 +0300
@@ -21,25 +21,25 @@
// System includes
#include <HbIcon>
#include <QScopedPointer>
+#include <QPointer>
// User includes
#include "radioviewbase.h"
-#include "radiowidgetsexport.h"
// Forward declarations
class RadioWindow;
class RadioStationModel;
class HbListView;
class HbPushButton;
-class RadioBannerLabel;
class HbAbstractViewItem;
class RadioUiLoader;
class RadioStation;
class RadioStationFilterModel;
class RadioFrequencyScanner;
+class QSortFilterProxyModel;
// Class declaration
-class WIDGETS_DLL_EXPORT RadioStationsView : public RadioViewBase
+class RadioStationsView : public RadioViewBase
{
Q_OBJECT
Q_PROPERTY(HbIcon nowPlayingIcon READ nowPlayingIcon WRITE setNowPlayingIcon)
@@ -58,14 +58,13 @@
private slots:
- void listItemClicked( const QModelIndex& index );
- void listItemLongPressed( HbAbstractViewItem* item, const QPointF& coords );
+ void handleClick( const QModelIndex& index );
+ void handleLongPress( HbAbstractViewItem* item, const QPointF& coords );
void updateAntennaStatus( bool connected );
- void updateCurrentStation();
- void deckButtonPressed();
+ void updateViewMode();
void startScanning();
void finishScanning();
- void updateControlVisibilities();
+ void updateVisibilities();
void clearList();
void rename(); // Called from context menu
void toggleFavorite(); // Called from context menu
@@ -79,10 +78,6 @@
void init();
void userAccepted();
-// from base class QGraphicsWidget
-
- void showEvent( QShowEvent* event );
-
// New functions
void initListView();
@@ -91,15 +86,13 @@
RadioStationModel* mModel;
- RadioStationFilterModel* mFilterModel;
+ QPointer<QSortFilterProxyModel> mFilterModel;
HbAction* mScanStationsAction;
HbAction* mClearListAction;
HbListView* mStationsList;
- RadioBannerLabel* mHeadingBanner;
-
HbAction* mFavoritesButton;
HbAction* mLocalStationsButton;
--- a/radioapp/radiowidgets/inc/radiostripbase.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiostripbase.h Fri Jun 11 13:38:32 2010 +0300
@@ -42,7 +42,7 @@
QAbstractItemModel* model() const;
void setCyclic( bool isCyclic );
- void setSpacing( qreal spacing );
+ void setOverlap( qreal overlap );
void setAutoCenter( bool autoCenter );
void setItemSize( const QSizeF& size );
void setIndex( int index, bool animateToCenter );
@@ -104,7 +104,7 @@
bool mIsCyclic;
bool mAutoCenter;
- qreal mSpacing;
+ qreal mOverlap;
QSizeF mItemSize;
--- a/radioapp/radiowidgets/inc/radiouiloader.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiouiloader.h Fri Jun 11 13:38:32 2010 +0300
@@ -25,71 +25,80 @@
namespace DOCML
{
- static QString FILE_MAINVIEW = ":/layout/mainview.docml";
- static QString FILE_STATIONSVIEW = ":/layout/stationsview.docml";
- static QString FILE_HISTORYVIEW = ":/layout/historyview.docml";
+ static const QLatin1String FILE_MAINVIEW ( ":/layout/mainview.docml" );
+ static const QLatin1String FILE_STATIONSVIEW ( ":/layout/stationsview.docml" );
+ static const QLatin1String FILE_HISTORYVIEW ( ":/layout/historyview.docml" );
// Generic XML UI definitions
- static QString NAME_VIEW = "view";
- static QString SECTION_PORTRAIT = "portrait";
- static QString SECTION_LANDSCAPE = "landscape";
- static QString NAME_LOUDSPEAKER_ACTION = "loudspeaker_action";
+ static const QLatin1String NAME_VIEW ( "view" );
+ static const QLatin1String SECTION_LAZY_LOAD ( "lazy_load" );
+ static const QLatin1String SECTION_PORTRAIT ( "portrait" );
+ static const QLatin1String SECTION_LANDSCAPE ( "landscape" );
+ static const QLatin1String NAME_LOUDSPEAKER_ACTION ( "loudspeaker_action" );
+ static const QLatin1String NAME_EXIT_ACTION ( "exit_action" );
// RadioMainView
- static QString MV_NAME_HISTORYVIEW_ACTION = "mv:historyview_action";
- static QString MV_NAME_STATION_CAROUSEL = "mv:station_carousel";
- static QString MV_NAME_FREQUENCY_STRIP = "mv:frequency_strip";
- static QString MV_NAME_STATIONS_BUTTON = "mv:stations_button";
- static QString MV_NAME_SCAN_BUTTON = "mv:scan_button";
- static QString MV_NAME_SPEAKER_BUTTON = "mv:loudspeaker_button";
- static QString MV_SECTION_NO_ANTENNA = "mv:no_antenna";
- static QString MV_SECTION_SEEKING = "mv:seeking";
- static QString MV_SECTION_SCANNING = "mv:scanning";
- static QString MV_SECTION_NO_FAVORITES = "mv:no_favorites";
- static QString MV_SECTION_NORMAL = "mv:normal";
+ static const QLatin1String MV_NAME_HISTORYVIEW_ACTION ( "mv:historyview_action" );
+ static const QLatin1String MV_NAME_STATION_CAROUSEL ( "mv:station_carousel" );
+ static const QLatin1String MV_NAME_FREQUENCY_STRIP ( "mv:frequency_strip" );
+ static const QLatin1String MV_NAME_STATIONS_BUTTON ( "mv:stations_button" );
+ static const QLatin1String MV_NAME_SCAN_BUTTON ( "mv:scan_button" );
+ static const QLatin1String MV_NAME_SPEAKER_BUTTON ( "mv:loudspeaker_button" );
+ static const QLatin1String MV_NAME_PREV_BUTTON ( "mv:prev_button" );
+ static const QLatin1String MV_NAME_NEXT_BUTTON ( "mv:next_button" );
+ static const QLatin1String MV_SECTION_NO_ANTENNA ( "mv:no_antenna" );
+ static const QLatin1String MV_SECTION_SEEKING ( "mv:seeking" );
+ static const QLatin1String MV_SECTION_SCANNING ( "mv:scanning" );
+ static const QLatin1String MV_SECTION_NO_FAVORITES ( "mv:no_favorites" );
+ static const QLatin1String MV_SECTION_NORMAL ( "mv:normal" );
// RadioStationsView
- static QString SV_NAME_HEADING_BANNER = "sv:heading_banner";
- static QString SV_NAME_STATIONS_LIST = "sv:stations_list";
- static QString SV_NAME_FAVORITES_BUTTON = "sv:favorite_stations_button";
- static QString SV_NAME_LOCALS_BUTTON = "sv:local_stations_button";
- static QString SV_NAME_SCAN_ACTION = "sv:scan_action";
- static QString SV_NAME_CLEAR_LIST_ACTION = "sv:clear_list_action";
- static QString SV_NAME_SCAN_BUTTON = "sv:scan_button";
+ static const QLatin1String SV_NAME_HEADING_BANNER ( "sv:heading_banner" );
+ static const QLatin1String SV_NAME_STATIONS_LIST ( "sv:stations_list" );
+ static const QLatin1String SV_NAME_FAVORITES_BUTTON ( "sv:favorite_stations_button" );
+ static const QLatin1String SV_NAME_LOCALS_BUTTON ( "sv:local_stations_button" );
+ static const QLatin1String SV_NAME_SCAN_ACTION ( "sv:scan_action" );
+ static const QLatin1String SV_NAME_CLEAR_LIST_ACTION ( "sv:clear_list_action" );
+ static const QLatin1String SV_NAME_SCAN_BUTTON ( "sv:scan_button" );
+ static const QLatin1String SV_NAME_RENAME_ACTION ( "sv:rename_action" );
+ static const QLatin1String SV_NAME_FAVORITE_ACTION ( "sv:toggle_favorite_action" );
+ static const QLatin1String SV_NAME_DELETE_ACTION ( "sv:delete_action" );
- static QString SV_SECTION_SHOW_ALL_STATIONS = "show_all_stations";
- static QString SV_SECTION_SHOW_FAVORITES = "show_favorites";
- static QString SV_SECTION_SHOW_SCAN_TEXT = "show_scan_text";
- static QString SV_SECTION_HIDE_SCAN_TEXT = "hide_scan_text";
+ static const QLatin1String SV_SECTION_SHOW_ALL_STATIONS ( "show_all_stations" );
+ static const QLatin1String SV_SECTION_SHOW_FAVORITES ( "show_favorites" );
+ static const QLatin1String SV_SECTION_SHOW_SCAN_TEXT ( "show_scan_text" );
+ static const QLatin1String SV_SECTION_HIDE_SCAN_TEXT ( "hide_scan_text" );
// RadioStationsView Context Menu
- static QString NAME_CONTEXT_MENU = "sv:context_menu";
- static QString NAME_CONTEXT_RENAME = "sv:rename_action";
- static QString NAME_CONTEXT_FAVORITE = "sv:toggle_favorite_action";
- static QString NAME_CONTEXT_DELETE = "sv:delete_action";
- static QString NAME_INPUT_QUERY = "sv:station_name_query";
+ static const QLatin1String NAME_CONTEXT_MENU ( "sv:context_menu" );
+ static const QLatin1String NAME_CONTEXT_RENAME ( "sv:rename_action" );
+ static const QLatin1String NAME_CONTEXT_FAVORITE ( "sv:toggle_favorite_action" );
+ static const QLatin1String NAME_CONTEXT_DELETE ( "sv:delete_action" );
+ static const QLatin1String NAME_INPUT_QUERY ( "sv:station_name_query" );
// Station Carousel
- static QString MV_NAME_INFO_FIRST_ROW = "mv:InfoFirstRow";
- static QString MV_NAME_INFO_SECOND_ROW = "mv:InfoSecondRow";
- static QString MV_NAME_INFO_THIRD_ROW = "mv:InfoThirdRow";
- static QString MV_NAME_INFO_FOURTH_ROW = "mv:InfoFourthRow";
- static QString MV_NAME_INFO_TEXT = "mv:info_text";
+ static const QLatin1String MV_NAME_INFO_FIRST_ROW ( "mv:InfoFirstRow" );
+ static const QLatin1String MV_NAME_INFO_SECOND_ROW ( "mv:InfoSecondRow" );
+ static const QLatin1String MV_NAME_INFO_THIRD_ROW ( "mv:InfoThirdRow" );
+ static const QLatin1String MV_NAME_INFO_FOURTH_ROW ( "mv:InfoFourthRow" );
+ static const QLatin1String MV_NAME_INFO_TEXT ( "mv:info_text" );
// History View
- static QString HV_NAME_CLEAR_LIST_ACTION = "hv:clear_list_action";
- static QString HV_NAME_HISTORY_LIST = "hv:history_list";
- static QString HV_NAME_ALL_SONGS_BUTTON = "hv:all_songs_button";
- static QString HV_NAME_TAGGED_SONGS_BUTTON = "hv:tagged_songs_button";
- static QString HV_SECTION_SHOW_LIST = "hv:show_list";
- static QString HV_SECTION_HIDE_LIST = "hv:hide_list";
- static QString HV_SECTION_HISTORY_MODE = "hv:history_mode";
- static QString HV_SECTION_FAVORITE_MODE = "hv:tagged_mode";
- static QString HV_NAME_CONTEXT_MENU = "hv:context_menu";
+ static const QLatin1String HV_NAME_CLEAR_LIST_ACTION ( "hv:clear_list_action" );
+ static const QLatin1String HV_NAME_HISTORY_LIST ( "hv:history_list" );
+ static const QLatin1String HV_NAME_ALL_SONGS_BUTTON ( "hv:all_songs_button" );
+ static const QLatin1String HV_NAME_TAGGED_SONGS_BUTTON ( "hv:tagged_songs_button" );
+ static const QLatin1String HV_SECTION_SHOW_LIST ( "hv:show_list" );
+ static const QLatin1String HV_SECTION_HIDE_LIST ( "hv:hide_list" );
+ static const QLatin1String HV_SECTION_HISTORY_MODE ( "hv:history_mode" );
+ static const QLatin1String HV_SECTION_FAVORITE_MODE ( "hv:tagged_mode" );
+ static const QLatin1String HV_NAME_CONTEXT_MENU ( "hv:context_menu" );
+ static const QLatin1String HV_NAME_TOGGLE_TAG_ACTION ( "hv:toggle_tag_action" );
+ static const QLatin1String HV_NAME_OVI_STORE_ACTION ( "hv:ovi_store_action" );
// History View Context Menu
- static QString HV_NAME_CONTEXT_TAG = "hv:toggle_tag_action";
- static QString HV_NAME_CONTEXT_SEARCH = "hv:search_from_other_store_action";
+ static const QLatin1String HV_NAME_CONTEXT_TAG ( "hv:toggle_tag_action" );
+ static const QLatin1String HV_NAME_CONTEXT_SEARCH ( "hv:search_from_other_store_action" );
}
--- a/radioapp/radiowidgets/inc/radiouiutilities.h Fri Jun 04 10:21:36 2010 +0100
+++ /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 _RADIOUIUTILITIES_H_
-#define _RADIOUIUTILITIES_H_
-
-// System includes
-#include <QPointer>
-
-// Forward declarations
-class RadioFrequencyStrip;
-class RadioStationCarousel;
-class RadioFrequencyScanner;
-
-struct EffectInfo
-{
- EffectInfo( QGraphicsItem* item, QString path, QString event ) :
- mItem( item ),
- mPath( path ),
- mEvent( event )
- {}
-
- QGraphicsItem* mItem;
- QString mPath;
- QString mEvent;
-
-private:
- EffectInfo();
-};
-typedef QList<EffectInfo> QEffectList;
-
-// Class declaration
-class RadioUiUtilities
-{
-public:
-
- static bool addEffects( QEffectList list );
-
- static RadioFrequencyStrip* frequencyStrip();
- static RadioStationCarousel* carousel();
- static bool isScannerAlive();
-
- static void setFrequencyStrip( RadioFrequencyStrip* frequencyStrip );
- static void setCarousel( RadioStationCarousel* carousel );
- static void setFrequencyScanner( RadioFrequencyScanner* scanner );
-
-private:
-
- RadioUiUtilities();
- ~RadioUiUtilities();
-
- static RadioUiUtilities& instance();
-
-private: // data
-
- QPointer<RadioFrequencyStrip> mFrequencyStrip;
-
- QPointer<RadioStationCarousel> mCarousel;
-
- QPointer<RadioFrequencyScanner> mScanner;
-
-};
-
-
-#endif // _RADIOUIUTILITIES_H_
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/inc/radioutil.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,95 @@
+/*
+* 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 _RADIOUIUTILITIES_H_
+#define _RADIOUIUTILITIES_H_
+
+// System includes
+#include <QPointer>
+
+// User includes
+#include "radio_global.h"
+
+// Forward declarations
+class RadioFrequencyStrip;
+class RadioStationCarousel;
+class RadioFrequencyScanner;
+class HbNotificationDialog;
+
+struct EffectInfo
+{
+ EffectInfo( QGraphicsItem* item, QString path, QString event ) :
+ mItem( item ),
+ mPath( path ),
+ mEvent( event )
+ {}
+
+ QGraphicsItem* mItem;
+ QString mPath;
+ QString mEvent;
+
+private:
+ EffectInfo();
+};
+typedef QList<EffectInfo> QEffectList;
+
+// Class declaration
+class RadioUtil
+{
+public:
+
+ static bool addEffects( QEffectList list );
+
+ static RadioFrequencyStrip* frequencyStrip();
+ static RadioStationCarousel* carousel();
+ static bool isScannerAlive();
+ static Scan::Status scanStatus();
+
+ static void setFrequencyStrip( RadioFrequencyStrip* frequencyStrip );
+ static void setCarousel( RadioStationCarousel* carousel );
+ static void setFrequencyScanner( RadioFrequencyScanner* scanner );
+ static void setScanStatus( Scan::Status status );
+
+ static Scroll::Direction scrollDirectionFromSkipMode( int skipMode );
+ static Scroll::Direction scrollDirection( int direction );
+ static TuneReason::Reason tuneReason( int tuneReason );
+
+ static void showDiscreetNote( const QString& text );
+
+private:
+
+ RadioUtil();
+ ~RadioUtil();
+
+ static RadioUtil& instance();
+
+private: // data
+
+ QPointer<RadioFrequencyStrip> mFrequencyStrip;
+
+ QPointer<RadioStationCarousel> mCarousel;
+
+ QPointer<RadioFrequencyScanner> mScanner;
+
+ QPointer<HbNotificationDialog> mNotificationDialog;
+
+ Scan::Status mScanStatus;
+
+};
+
+
+#endif // _RADIOUIUTILITIES_H_
--- a/radioapp/radiowidgets/inc/radioviewbase.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radioviewbase.h Fri Jun 11 13:38:32 2010 +0300
@@ -20,8 +20,8 @@
// System includes
#include <HbView>
-
#include <QScopedPointer>
+#include <QSharedPointer>
// User includes
@@ -30,13 +30,15 @@
class RadioStationModel;
class RadioUiLoader;
class HbAction;
+class RadioUiEngine;
// Constants
namespace MenuItem
{
enum CommonMenuItem
{
- UseLoudspeaker
+ UseLoudspeaker,
+ Exit
};
}
@@ -51,9 +53,9 @@
virtual ~RadioViewBase();
- void setMembers( RadioUiLoader* uiLoader, RadioWindow* mainWindow );
+ void setMembers( RadioWindow* mainWindow, RadioUiLoader* uiLoader );
- virtual void init() = 0;
+ void initialize( QSharedPointer<RadioUiEngine> uiEngine );
bool isInitialized() const;
@@ -61,6 +63,8 @@
void updateOrientation( Qt::Orientation orientation, bool forceUpdate = false );
+ void bringToForeground();
+
protected slots:
void updateAudioRouting( bool loudspeaker );
@@ -76,10 +80,10 @@
// New functinos
void initBackAction();
-
+
void connectCommonMenuItem( int menuItem );
- void connectXmlElement( const char* name, const char* signal, QObject* receiver, const char* slot );
+ void connectXmlElement( const QString& name, const char* signal, QObject* receiver, const char* slot );
void connectViewChangeMenuItem( QString name, const char* slot );
@@ -89,6 +93,8 @@
private:
+ virtual void init() = 0;
+
virtual void setOrientation();
virtual void userAccepted();
@@ -106,7 +112,11 @@
*/
QScopedPointer<RadioUiLoader> mUiLoader;
- bool mInitialized;
+ /**
+ * Pointer to the ui engine
+ * Shared among all views and the radio window
+ */
+ QSharedPointer<RadioUiEngine> mUiEngine;
/**
* Flag indicating whether or not the view is transient
--- a/radioapp/radiowidgets/inc/radiowindow.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiowindow.h Fri Jun 11 13:38:32 2010 +0300
@@ -23,6 +23,9 @@
#include <HbEffect>
#include <QPointer>
#include <QScopedPointer>
+#include <QSharedPointer>
+#include <qsysteminfo.h>
+using namespace QtMobility; // has to be here to be able to connect SLOT queryOfflineUsage
// User includes
#include "radiowidgetsexport.h"
@@ -31,6 +34,7 @@
class RadioViewBase;
class RadioUiEngine;
class HbVolumeSliderPopup;
+class HbMessageBox;
typedef QScopedPointer<HbVolumeSliderPopup> VolumeSliderPtr;
@@ -49,15 +53,13 @@
public:
- RadioWindow( QWidget *parent = 0 );
+ RadioWindow( QWidget* parent = 0 );
~RadioWindow();
void showErrorMessage( const QString& text );
- void init();
-
- RadioUiEngine& uiEngine();
+ void init( QSystemDeviceInfo* deviceInfo );
QString orientationSection();
@@ -75,44 +77,57 @@
void updateOrientation( Qt::Orientation orientation );
void showVolumeLevel( int volume );
void updateAntennaStatus( bool connected );
+ void queryOfflineUsage( QSystemDeviceInfo::Profile profile );
private:
// New functions
- void activateView( ViewPtr& aMember, const QString& docmlFile, Hb::ViewSwitchFlags flags = Hb::ViewSwitchDefault );
+ void activateView( RadioViewBase* aMember, const QString& docmlFile, Hb::ViewSwitchFlags flags = Hb::ViewSwitchDefault );
private: // data
/*!
* Pointer to the UI engine
- * Own
+ * Own, shared with views
*/
- QScopedPointer<RadioUiEngine> mUiEngine;
+ QSharedPointer<RadioUiEngine> mUiEngine;
/**
* Tuning view.
* Own.
*/
- ViewPtr mMainView;
+ ViewPtr mMainView;
/**
* Stations view
* Own.
*/
- ViewPtr mStationsView;
+ ViewPtr mStationsView;
/**
* Play history view
* Own.
*/
- ViewPtr mHistoryView;
+ ViewPtr mHistoryView;
/**
* Pointer to the volume slider
* Own.
*/
- VolumeSliderPtr mVolSlider;
+ VolumeSliderPtr mVolSlider;
+
+ /**
+ * Pointer to messagebox
+ * Own.
+ */
+ QScopedPointer<HbMessageBox> mMessageBox;
+
+ /**
+ * Pointer to qsystemdeviceinfo
+ * Own.
+ */
+ QScopedPointer<QSystemDeviceInfo> mDeviceInfo;
};
--- a/radioapp/radiowidgets/radiowidgets.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/radiowidgets.pro Fri Jun 11 13:38:32 2010 +0300
@@ -17,24 +17,28 @@
include(../buildflags.pri)
TEMPLATE = lib
-TARGET = radiowidgets
+TARGET = fmradiowidgets
CONFIG += dll hb
+CONFIG += mobility
+MOBILITY = systeminfo
DEFINES += BUILD_WIDGETS_DLL
+symbian:TARGET.UID3 = 0x2002FF4C
+
INCLUDEPATH += inc
INCLUDEPATH += ../radiouiengine/inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
-LIBS += -lradiouiengine
+LIBS += -lfmradiouiengine
-LOGGING_ENABLED:LIBS += -lradioenginewrapper
+LOGGING_ENABLED:LIBS += -lfmradioenginewrapper
DEPENDPATH += $$INCLUDEPATH src
# Input
HEADERS += radiowidgetsexport.h
HEADERS += radiowindow.h
-HEADERS += radiouiutilities.h
+HEADERS += radioutil.h
HEADERS += radioviewbase.h
HEADERS += radiouiloader.h
HEADERS += radiomainview.h
@@ -42,15 +46,15 @@
HEADERS += radiofrequencystrip.h
HEADERS += radiofrequencyitem.h
HEADERS += radiostationsview.h
-HEADERS += radiobannerlabel.h
HEADERS += radiofrequencyscanner.h
HEADERS += radiofadinglabel.h
HEADERS += radiostationcarousel.h
-HEADERS += radiostationitem.h
+HEADERS += radiocarouselitem.h
+HEADERS += radiocarouselanimator.h
HEADERS += radiohistoryview.h
SOURCES += radiowindow.cpp
-SOURCES += radiouiutilities.cpp
+SOURCES += radioutil.cpp
SOURCES += radioviewbase.cpp
SOURCES += radiouiloader.cpp
SOURCES += radiomainview.cpp
@@ -58,11 +62,11 @@
SOURCES += radiofrequencystrip.cpp
SOURCES += radiofrequencyitem.cpp
SOURCES += radiostationsview.cpp
-SOURCES += radiobannerlabel.cpp
SOURCES += radiofrequencyscanner.cpp
SOURCES += radiofadinglabel.cpp
SOURCES += radiostationcarousel.cpp
-SOURCES += radiostationitem.cpp
+SOURCES += radiocarouselitem.cpp
+SOURCES += radiocarouselanimator.cpp
SOURCES += radiohistoryview.cpp
RESOURCES += res/fmradioui.qrc
--- a/radioapp/radiowidgets/res/layout/historyview.docml Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/res/layout/historyview.docml Fri Jun 11 13:38:32 2010 +0300
@@ -23,13 +23,13 @@
<object name="hv:toggle_tag_action" type="HbAction">
<string locid="txt_rad_menu_tag_song" name="text"/>
</object>
- <object name="hv:search_from_ovi_store_action" type="HbAction">
+ <object name="hv:ovi_store_action" type="HbAction">
<string locid="txt_rad_menu_search_from_music_store" name="text"/>
</object>
<object name="hv:search_from_other_store_action" type="HbAction">
<string locid="txt_rad_menu_search_from_other_store" name="text"/>
</object>
- <widget name="view" plugin="radiowidgetsplugin" type="RadioHistoryView">
+ <widget name="view" type="HbView">
<icon name="nonTaggedIcon" iconName=":/images/qtg_mono_tag.svg" />
<icon name="taggedIcon" iconName=":/images/pri_small_tag.svg" />
<widget name="hv:menu" role="HbView:menu" type="HbMenu">
@@ -44,10 +44,12 @@
<ref object="hv:tagged_songs_button" role="HbToolBar:addAction"/>
</widget>
<widget name="content" role="HbView:widget" type="HbWidget">
- <widget name="hv:heading_banner" plugin="radiowidgetsplugin" type="RadioBannerLabel">
- <sizehint height="30" type="MAXIMUM"/>
- <string name="plainText" locid="txt_rad_subhead_play_history" />
- </widget>
+ <widget name="hv:heading_banner" type="HbGroupBox">
+ <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary)+2*var(hb-param-margin-gene-middle-vertical))" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <string name="heading" locid="txt_rad_subhead_play_history" />
+ </widget>
<widget name="hv:stacked_widget" type="HbWidget">
<widget name="hv:history_list" type="HbListView">
<sizehint height="320" type="PREFERRED" width="240"/>
@@ -94,16 +96,8 @@
</widget>
<widget name="hv:context_menu" type="HbMenu">
<ref object="hv:toggle_tag_action" role="HbMenu:addAction"/>
- <ref object="hv:search_from_ovi_store_action" role="HbMenu:addAction"/>
- <ref object="hv:search_from_other_store_action" role="HbMenu:addAction"/>
+ <ref object="hv:ovi_store_action" role="HbMenu:addAction"/>
</widget>
- <connect receiver="view" sender="exit_action" signal="triggered()" slot="quit()"/>
- <connect receiver="hv:tagged_songs_button" sender="hv:all_songs_button" signal="triggered()" slot="toggle()"/>
- <connect receiver="hv:all_songs_button" sender="hv:tagged_songs_button" signal="triggered()" slot="toggle()"/>
- <connect receiver="view" sender="hv:history_list" signal="activated(QModelIndex)" slot="showContextMenu(QModelIndex)"/>
- <connect receiver="view" sender="hv:toggle_tag_action" signal="triggered()" slot="toggleTagging()"/>
- <connect receiver="view" sender="hv:search_from_ovi_store_action" signal="triggered()" slot="openOviStore()"/>
- <connect receiver="view" sender="hv:search_from_other_store_action" signal="triggered()" slot="openOtherStore()"/>
<section name="hv:show_list">
<widget name="hv:history_list">
<bool name="visible" value="TRUE"/>
@@ -137,7 +131,7 @@
<string locid="txt_rad_info_recently_played_songs_collects_song2" name="plainText"/>
</widget>
<widget name="hv:heading_banner">
- <string name="plainText" locid="txt_rad_subhead_play_history" />
+ <string name="heading" locid="txt_rad_subhead_play_history" />
</widget>
</section>
<section name="hv:tagged_mode">
@@ -151,7 +145,7 @@
<string locid="txt_rad_info_you_can_add_song_to_the_tagged_songs" name="plainText"/>
</widget>
<widget name="hv:heading_banner">
- <string name="plainText" locid="txt_rad_button_tagged_songs" />
+ <string name="heading" locid="txt_rad_button_tagged_songs" />
</widget>
</section>
<metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
--- a/radioapp/radiowidgets/res/layout/mainview.docml Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/res/layout/mainview.docml Fri Jun 11 13:38:32 2010 +0300
@@ -1,55 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument context="RadioMainView" version="0.9">
- <object name="mv:historyview_action" type="HbAction">
- <string name="text" locid="txt_rad_opt_play_history" />
- </object>
- <object name="exit_action" type="HbAction">
- <string name="text" locid="txt_common_opt_exit" />
- </object>
- <widget name="view" plugin="radiowidgetsplugin" type="RadioMainView">
- <widget name="menu" role="HbView:menu" type="HbMenu">
- <ref object="mv:historyview_action" role="HbMenu:addAction"/>
- <ref object="exit_action" role="HbMenu:addAction"/>
- </widget>
+ <widget name="view" type="HbView">
<widget name="mv:container" role="HbView:widget" type="HbWidget">
<widget name="mv:info_area" type="HbWidget">
<widget name="mv:carousel_background" type="HbLabel">
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
<icon name="icon" iconName=":/images/qtg_fr_lcd.svg" />
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
</widget>
<widget name="mv:carousel_overlay" type="HbLabel">
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
<icon name="icon" iconName=":/images/qtg_fr_lcd_overlay.svg" />
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
</widget>
- <widget name="mv:station_carousel" plugin="radiowidgetsplugin" type="RadioStationCarousel">
- <icon name="favoriteIcon" iconName=":/images/pri_small_star.svg" />
- <icon name="nonFavoriteIcon" iconName=":/images/pri_small_star_inactive.svg" />
- <widget name="mv:info_text" type="HbLabel" >
- <bool name="visible" value="FALSE"/>
- <sizehint height="200" width="300" type="PREFERRED"/>
- </widget>
- </widget>
<layout type="stacked">
<stackitem itemname="mv:carousel_background"/>
<stackitem itemname="mv:carousel_overlay"/>
- <stackitem itemname="mv:station_carousel"/>
</layout>
</widget>
<widget name="mv:control_widget" type="HbWidget" >
<widget name="mv:stations_button" type="HbPushButton">
<bool name="stretched" value="TRUE" />
<string name="text" locid="txt_rad_button_stations" />
- <icon name="icon" iconName="qtg_mono_radio_stations.svg" />
+ <icon name="icon" iconName="qtg_mono_radio_stations" />
</widget>
<widget name="mv:scan_button" type="HbPushButton">
<bool name="stretched" value="TRUE" />
<string name="text" locid="txt_rad_button_search_all_stations" />
- <icon name="icon" iconName="qtg_mono_station_scan.svg" />
+ <icon name="icon" iconName="qtg_mono_station_scan" />
</widget>
<widget name="mv:loudspeaker_button" type="HbPushButton">
<bool name="stretched" value="TRUE" />
<string name="text" locid="txt_rad_button_activate_loudspeaker" />
- <icon name="icon" iconName="qtg_mono_speaker.svg" />
+ <icon name="icon" iconName="qtg_mono_speaker" />
</widget>
<layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
<contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
@@ -61,15 +44,12 @@
</layout>
</widget>
<widget name="mv:frequency_area" type="HbWidget">
- <widget name="mv:frequency_background" type="HbLabel">
- <icon name="icon" iconName=":/images/qtg_fr_tuner.svg" />
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <widget name="mv:frequency_background" type="HbLabel">
+ <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
+ <icon name="icon" iconName=":/images/qtg_fr_tuner.svg"/>
</widget>
- <widget name="mv:frequency_strip" plugin="radiowidgetsplugin" type="RadioFrequencyStrip">
- <icon name="leftButtonIcon" iconName=":/images/qtg_mono_previous.svg" />
- <icon name="rightButtonIcon" iconName=":/images/qtg_mono_next.svg" />
- <integer name="autoScrollTime" value="1000"/>
- </widget>
+ <widget name="mv:frequency_strip" plugin="fmradiowidgetsplugin" type="RadioFrequencyStrip" />
<layout type="stacked">
<stackitem itemname="mv:frequency_background"/>
<stackitem itemname="mv:frequency_strip"/>
@@ -78,34 +58,72 @@
</widget>
<string name="title" locid="txt_rad_title_fm_radio"/>
</widget>
- <connect receiver="view" sender="exit_action" signal="triggered()" slot="quit()"/>
+ <section name="lazy_load">
+ <object name="mv:historyview_action" type="HbAction">
+ <string name="text" locid="txt_rad_opt_play_history" />
+ </object>
+ <object name="exit_action" type="HbAction">
+ <string name="text" locid="txt_common_opt_exit" />
+ </object>
+ <widget name="view">
+ <widget name="menu" role="HbView:menu" type="HbMenu">
+ <ref object="mv:historyview_action" role="HbMenu:addAction"/>
+ <ref object="exit_action" role="HbMenu:addAction"/>
+ </widget>
+ </widget>
+ <widget name="mv:info_area">
+ <widget name="mv:station_carousel" plugin="fmradiowidgetsplugin" type="RadioStationCarousel">
+ <icon name="favoriteIcon" iconName=":/images/pri_small_star.svg" />
+ <icon name="nonFavoriteIcon" iconName=":/images/pri_small_star_inactive.svg" />
+ <integer name="autoScrollTime" value="1000"/>
+ <widget name="mv:info_text" type="HbLabel" >
+ <bool name="visible" value="FALSE"/>
+ <sizehint height="200" width="300" type="PREFERRED"/>
+ </widget>
+ </widget>
+ <layout type="stacked">
+ <stackitem itemname="mv:carousel_background"/>
+ <stackitem itemname="mv:carousel_overlay"/>
+ <stackitem itemname="mv:station_carousel"/>
+ </layout>
+ </widget>
+ <widget name="mv:frequency_strip">
+ <widget name="mv:prev_button" type="HbPushButton">
+ <icon name="icon" iconName="qtg_mono_previous" />
+ </widget>
+ <widget name="mv:next_button" type="HbPushButton">
+ <icon name="icon" iconName="qtg_mono_next" />
+ </widget>
+ <integer name="autoScrollTime" value="1000"/>
+ </widget>
+ </section>
<section name="portrait">
<widget name="mv:frequency_area">
- <sizehint height="70" width="360" type="PREFERRED"/>
+ <sizehint height="70" type="PREFERRED"/>
</widget>
<widget name="mv:info_area">
- <sizehint height="280" type="PREFERRED" width="360"/>
+ <sizehint height="285" type="PREFERRED" width="360"/>
</widget>
<widget name="mv:control_widget">
- <sizehint height="280" type="PREFERRED" width="300"/>
+ <sizehint height="285" type="PREFERRED" width="360"/>
</widget>
<widget name="mv:container">
<layout orientation="Vertical" spacing="0un" type="linear">
- <linearitem itemname="mv:info_area"/>
+ <linearitem itemname="mv:info_area" stretchfactor="1"/>
<linearitem itemname="mv:frequency_area"/>
- <linearitem itemname="mv:control_widget"/>
+ <linearitem itemname="mv:control_widget" stretchfactor="1"/>
</layout>
</widget>
</section>
<section name="landscape">
<widget name="mv:frequency_area">
- <sizehint height="50" width="640" type="PREFERRED"/>
+ <sizehint height="50" type="MINIMUM"/>
</widget>
<widget name="mv:info_area">
- <sizehint height="300" type="PREFERRED" width="230"/>
+ <sizehint height="310" type="PREFERRED" width="320"/>
</widget>
<widget name="mv:control_widget">
- <sizehint height="230" type="PREFERRED" width="230"/>
+ <sizehint height="310" type="PREFERRED" width="320"/>
</widget>
<widget name="mv:container">
<layout spacing="0un" type="grid">
@@ -118,7 +136,7 @@
<!-- Scanning layout -->
<section name="mv:scanning">
<object name="mv:historyview_action">
- <bool name="visible" value="FALSE"/>
+ <bool name="enabled" value="FALSE"/>
</object>
<widget name="mv:stations_button">
<bool name="visible" value="FALSE"/>
@@ -135,14 +153,14 @@
<!-- Normal layout (not scanning) -->
<section name="mv:normal">
<object name="mv:historyview_action">
- <bool name="visible" value="TRUE"/>
+ <bool name="enabled" value="TRUE"/>
</object>
<widget name="mv:stations_button">
<bool name="visible" value="TRUE"/>
</widget>
<widget name="mv:scan_button">
<string name="text" locid="txt_rad_button_search_all_stations" />
- <icon name="icon" iconName="qtg_mono_station_scan.svg" />
+ <icon name="icon" iconName="qtg_mono_station_scan" />
</widget>
<widget name="mv:loudspeaker_button">
<bool name="visible" value="TRUE"/>
--- a/radioapp/radiowidgets/res/layout/radiostationitem.css Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/res/layout/radiostationitem.css Fri Jun 11 13:38:32 2010 +0300
@@ -1,15 +1,15 @@
-RadioStationItem {
+RadioCarouselItem {
layout: default
}
-RadioStationItem::favorite_button {
+RadioCarouselItem::favorite_button {
max-width: 6un;
max-height: 6un;
top: -var(hb-param-margin-gene-top);
left: -var(hb-param-margin-gene-left)
}
-RadioStationItem::genre_label {
+RadioCarouselItem::genre_label {
pref-height: 6un;
top: -var(hb-param-margin-gene-top);
right: 8un;
@@ -22,7 +22,7 @@
font-variant: secondary;
}
-RadioStationItem::name_label {
+RadioCarouselItem::name_label {
pref-height: 5un;
left: -var(hb-param-margin-gene-left);
top: -var(hb-param-margin-gene-top);
@@ -35,7 +35,7 @@
font-variant: primary;
}
-RadioStationItem::rt_label {
+RadioCarouselItem::rt_label {
pref-height: 21un;
left: -var(hb-param-margin-gene-left);
top: -var(hb-param-margin-gene-top);
@@ -48,7 +48,7 @@
font-variant: secondary;
}
-RadioStationItem::url_label {
+RadioCarouselItem::url_label {
pref-height: 5un;
left: -var(hb-param-margin-gene-left);
top: -var(hb-param-margin-gene-top);
--- a/radioapp/radiowidgets/res/layout/radiostationitem.widgetml Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/res/layout/radiostationitem.widgetml Fri Jun 11 13:38:32 2010 +0300
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbwidget type="RadioStationItem" version="0.1">
+<hbwidget type="RadioCarouselItem" version="0.1">
<layout name="default" type="mesh">
<meshitem dst="" dstEdge="TOP" src="favorite_button" srcEdge="TOP"/>
<meshitem dst="" dstEdge="LEFT" src="favorite_button" srcEdge="LEFT"/>
--- a/radioapp/radiowidgets/res/layout/stationsview.docml Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/res/layout/stationsview.docml Fri Jun 11 13:38:32 2010 +0300
@@ -26,17 +26,17 @@
</object>
<object name="sv:local_stations_button" type="HbAction">
<bool name="checkable" value="TRUE"/>
- <icon iconName=":/images/removefavoriteicon.png" name="icon"/>
+ <icon iconName=":/images/pri_small_star_inactive.svg" name="icon"/>
<string name="text" locid="txt_rad_button_local_stations" />
</object>
<object name="sv:favorite_stations_button" type="HbAction">
<bool name="checkable" value="TRUE"/>
- <icon iconName=":/images/setfavoriteicon.png" name="icon"/>
+ <icon iconName=":/images/pri_small_star.svg" name="icon"/>
<string name="text" locid="txt_rad_button_favourites" />
</object>
- <widget name="view" plugin="radiowidgetsplugin" type="RadioStationsView">
+ <widget name="view" type="HbView">
<icon name="nowPlayingIcon" iconName=":/images/nowplayingicon.png" />
- <icon name="favoriteIcon" iconName=":/images/setfavoriteicon.png" />
+ <icon name="favoriteIcon" iconName=":/images/pri_small_star.svg" />
<widget name="mMenu" role="HbView:menu" type="HbMenu">
<ref object="sv:scan_action" role="HbMenu:addAction"/>
<ref object="sv:clear_list_action" role="HbMenu:addAction"/>
@@ -49,13 +49,15 @@
<ref object="sv:favorite_stations_button" role="HbToolBar:addAction"/>
</widget>
<widget name="content" role="HbView:widget" type="HbWidget">
- <widget name="sv:heading_banner" plugin="radiowidgetsplugin" type="RadioBannerLabel">
- <sizehint height="30" type="MAXIMUM"/>
- <string name="plainText" locid="txt_rad_subhead_all_stations" />
+ <widget name="sv:heading_banner" type="HbGroupBox">
+ <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="expr(var(hb-param-text-height-secondary)+2*var(hb-param-margin-gene-middle-vertical))" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <string name="heading" locid="txt_rad_subhead_all_stations" />
</widget>
<widget name="sv:stacked_widget" type="HbWidget">
<widget name="sv:scan_button" type="HbPushButton">
- <bool name="visible" value="TRUE"/>
+ <bool name="visible" value="FALSE"/>
</widget>
<widget name="sv:empty_container" type="HbWidget">
<bool name="visible" value="FALSE"/>
@@ -102,13 +104,6 @@
</widget>
<string name="title" locid="txt_rad_title_fm_radio"/>
</widget>
- <connect receiver="view" sender="sv:scan_action" signal="triggered()" slot="startScanning()"/>
- <connect receiver="view" sender="sv:scan_button" signal="clicked()" slot="startScanning()"/>
- <connect receiver="view" sender="exit_action" signal="triggered()" slot="quit()"/>
- <connect receiver="view" sender="sv:stations_list" signal="pressed(QModelIndex)" slot="listItemClicked(QModelIndex)"/>
- <connect receiver="view" sender="sv:stations_list" signal="longPressed(HbAbstractViewItem*,const QPointF)" slot="listItemLongPressed(HbAbstractViewItem*,const QPointF)"/>
- <connect receiver="sv:favorite_stations_button" sender="sv:local_stations_button" signal="triggered()" slot="toggle()"/>
- <connect receiver="sv:local_stations_button" sender="sv:favorite_stations_button" signal="triggered()" slot="toggle()"/>
<widget name="sv:context_menu" type="HbMenu">
<ref object="sv:play_action" role="HbMenu:addAction" />
@@ -116,9 +111,6 @@
<ref object="sv:toggle_favorite_action" role="HbMenu:addAction" />
<ref object="sv:delete_action" role="HbMenu:addAction" />
</widget>
- <connect receiver="view" sender="sv:rename_action" signal="triggered()" slot="rename()"/>
- <connect receiver="view" sender="sv:toggle_favorite_action" signal="triggered()" slot="toggleFavorite()"/>
- <connect receiver="view" sender="sv:delete_action" signal="triggered()" slot="deleteStation()"/>
<section name="show_scan_text">
<widget name="sv:stations_list">
@@ -127,6 +119,9 @@
<widget name="sv:empty_container">
<bool name="visible" value="TRUE"/>
</widget>
+ <widget name="sv:scan_button">
+ <bool name="visible" value="TRUE"/>
+ </widget>
</section>
<section name="hide_scan_text">
<widget name="sv:stations_list">
@@ -135,6 +130,9 @@
<widget name="sv:empty_container">
<bool name="visible" value="FALSE"/>
</widget>
+ <widget name="sv:scan_button">
+ <bool name="visible" value="FALSE"/>
+ </widget>
</section>
<section name="show_all_stations">
<object name="sv:local_stations_button">
@@ -144,7 +142,7 @@
<bool name="checked" value="FALSE"/>
</object>
<widget name="sv:heading_banner">
- <string name="plainText" locid="txt_rad_subhead_all_stations" />
+ <string name="heading" locid="txt_rad_subhead_all_stations" />
</widget>
<widget name="sv:scan_button">
<bool name="visible" value="TRUE"/>
@@ -164,7 +162,7 @@
<bool name="checked" value="TRUE"/>
</object>
<widget name="sv:heading_banner">
- <string name="plainText" locid="txt_rad_subhead_favorite_stations" />
+ <string name="heading" locid="txt_rad_subhead_favorite_stations" />
</widget>
<widget name="sv:scan_button">
<bool name="visible" value="FALSE"/>
--- a/radioapp/radiowidgets/src/radiobannerlabel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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:
-*
-*/
-
-#include "radiobannerlabel.h"
-
-#include <QPainter>
-
-/*!
- *
- */
-RadioBannerLabel::RadioBannerLabel( QGraphicsItem * parent ) :
- HbLabel( parent )
-{
- QFont currentfont( font() );
- currentfont.setBold( true );
- currentfont.setPixelSize( 18 );
- setFont( currentfont );
-}
-
-/*!
- *
- */
-void RadioBannerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget )
-{
- painter->setPen(QPen(QColor(200, 200, 200, 150)));
- painter->setBrush(QBrush(QColor(200, 200, 200, 150),Qt::SolidPattern));
- painter->drawRect(option->rect);
- HbLabel::paint( painter, option, widget );
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/src/radiocarouselanimator.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,217 @@
+/*
+* 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 <QTimer>
+#include <QTimeLine>
+#include <HbLabel>
+
+// User includes
+#include "radiocarouselanimator.h"
+#include "radiostationcarousel.h"
+#include "radiocarouselitem.h"
+#include "radiostation.h"
+#include "radiostationmodel.h"
+#include "radiologger.h"
+
+// Constants
+const int FREQUENCY_SCROLL_DIVIDER = 100000;
+const int NUMBER_SCROLL_TIMELINE_DURATION = 1000;
+const int FLASH_TIMER_INTERVAL = 400;
+const qreal FLASHING_ITEM_DIM_OPACITY = 0.3;
+const qreal FLASHING_ITEM_NORMAL_OPACITY = 1.0;
+
+/*!
+ *
+ */
+RadioCarouselAnimator::RadioCarouselAnimator( RadioStationCarousel& carousel ) :
+ mCarousel( carousel ),
+ mAnimationTimeLine( new QTimeLine( NUMBER_SCROLL_TIMELINE_DURATION, this ) ),
+ mTimer( new QTimer( this ) ),
+ mCanceled( false ),
+ mMode( NoAnimation ),
+ mStationIsFavorite( false ),
+ mFlashingToggle( false )
+{
+ mAnimationTimeLine->setCurveShape( QTimeLine::EaseInCurve );
+ Radio::connect( mAnimationTimeLine, SIGNAL(finished()),
+ this, SLOT(finalizeNumberScroll()) );
+ Radio::connect( mAnimationTimeLine, SIGNAL(frameChanged(int)),
+ this, SLOT(updateNumberScroll(int)) );
+
+ mTimer->setInterval( FLASH_TIMER_INTERVAL );
+ mTimer->setSingleShot( false );
+ Radio::connect( mTimer, SIGNAL(timeout()),
+ this, SLOT(handleTimeout()) );
+}
+
+/*!
+ *
+ */
+RadioCarouselAnimator::~RadioCarouselAnimator()
+{
+ stopAll();
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::startNumberScroll( const uint startFrequency, const uint stopFrequency )
+{
+ addMode( ScrollingNumbers );
+
+ //TODO: Take italy case into account
+ mAnimationTimeLine->setDuration( NUMBER_SCROLL_TIMELINE_DURATION );
+ mAnimationTimeLine->setFrameRange( startFrequency / FREQUENCY_SCROLL_DIVIDER,
+ stopFrequency / FREQUENCY_SCROLL_DIVIDER );
+ mAnimationTimeLine->start();
+
+ mCarousel.scrollContentsTo( QPointF( -mCarousel.mMaxScrollPos, 0 ), mCarousel.mAutoScrollTime );
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::startFlashingIcon()
+{
+ const uint frequency = mCarousel.mItems[RadioStationCarousel::CenterItem]->frequency();
+ RadioStation station;
+ mCarousel.mModel->findFrequency( frequency, station );
+ mStationIsFavorite = station.isFavorite();
+
+ mCarousel.mItems[RadioStationCarousel::CenterItem]->setIconOpacity( FLASHING_ITEM_DIM_OPACITY );
+
+ addMode( FlashingIcon );
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::stopFlashingIcon()
+{
+ mCarousel.mItems[RadioStationCarousel::CenterItem]->setIconOpacity( FLASHING_ITEM_NORMAL_OPACITY );
+ removeMode( FlashingIcon );
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::startFlashingText()
+{
+ mCarousel.mInfoText->setOpacity( FLASHING_ITEM_DIM_OPACITY );
+ addMode( FlashingText );
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::stopFlashingText()
+{
+ mCarousel.mInfoText->setOpacity( FLASHING_ITEM_NORMAL_OPACITY );
+ removeMode( FlashingText );
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::stopAll()
+{
+ mCanceled = true;
+ mAnimationTimeLine->stop();
+ mTimer->stop();
+
+ stopFlashingText();
+ stopFlashingIcon();
+
+ mMode = NoAnimation;
+ deleteLater();
+}
+
+/*!
+ * Private slot
+ *
+ */
+void RadioCarouselAnimator::handleTimeout()
+{
+ mFlashingToggle = !mFlashingToggle;
+ if ( mMode.testFlag( IconItem ) ) {
+ if ( mFlashingToggle ) {
+ mCarousel.mItems[RadioStationCarousel::CenterItem]->setIconOpacity( FLASHING_ITEM_NORMAL_OPACITY );
+ } else {
+ mCarousel.mItems[RadioStationCarousel::CenterItem]->setIconOpacity( FLASHING_ITEM_DIM_OPACITY );
+ }
+ }
+
+ if ( mMode.testFlag( TextItem ) ) {
+ if ( mFlashingToggle ) {
+ mCarousel.mInfoText->setOpacity( FLASHING_ITEM_NORMAL_OPACITY );
+ } else {
+ mCarousel.mInfoText->setOpacity( FLASHING_ITEM_DIM_OPACITY );
+ }
+ }
+}
+
+/*!
+ * Private slot
+ *
+ */
+void RadioCarouselAnimator::updateNumberScroll( int value )
+{
+ mCarousel.mItems[RadioStationCarousel::RightItem]->setFrequency( value * FREQUENCY_SCROLL_DIVIDER );
+}
+
+/*!
+ * Private slot
+ *
+ */
+void RadioCarouselAnimator::finalizeNumberScroll()
+{
+ if ( !mCanceled ) {
+ mCarousel.mItems[RadioStationCarousel::CenterItem]->setFrequency(
+ mCarousel.mItems[RadioStationCarousel::RightItem]->frequency() );
+ mCarousel.scrollContentsTo( QPointF( -mCarousel.mMidScrollPos, 0 ), 0 );
+ emit mCarousel.scanAnimationFinished();
+ }
+ removeMode( ScrollingNumbers );
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::addMode( AnimationMode mode )
+{
+ mMode |= mode;
+ if ( mMode.testFlag( TimerItem ) && !mTimer->isActive() ) {
+ mTimer->start();
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselAnimator::removeMode( AnimationMode mode )
+{
+ mMode &= ~mode;
+ if ( !mMode.testFlag( TimerItem ) ) {
+ mTimer->stop();
+ }
+
+ if ( mMode == NoAnimation ) {
+ deleteLater();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/src/radiocarouselitem.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,354 @@
+/*
+* 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 <HbStyleLoader>
+#include <HbPushButton>
+#include <HbAnchorLayout>
+#include <HbMessageBox>
+
+// User includes
+#include "radiocarouselitem.h"
+#include "radiostation.h"
+#include "radiostationcarousel.h"
+#include "radiouiengine.h"
+#include "radiofadinglabel.h"
+#include "radiostationmodel.h"
+#include "radiologger.h"
+
+//static const char* FILE_PATH_WIDGETML = ":/layout/radiostationitem.widgetml";
+//static const char* FILE_PATH_CSS = ":/layout/radiostationitem.css";
+static const char* GENRE_LABEL = "tv:genre_label";
+static const char* NAME_LABEL = "tv:name_label";
+static const char* RADIOTEXT_LABEL = "tv:radiotext_label";
+static const char* URL_LABEL = "tv:url_label";
+//static const char* FAVORITE_BUTTON = "favorite_button";
+
+const char* SEEKING_TEXT = "txt_rad_list_tuning";
+const char* CONNECT_HEADSET_TEXT = "txt_rad_list_connect_wireless_antenna_headset_with";
+
+/*!
+ *
+ */
+RadioCarouselItem::RadioCarouselItem( RadioStationCarousel& carousel ) :
+ HbWidget( &carousel ),
+ mCarousel( carousel ),
+ mData( new Data() )
+{
+ mData->mStation.reset( new RadioStation() );
+
+ mData->mIconButton.reset( new HbPushButton( this ) );
+ QPixmap background( QSize( 70, 70 ) );
+ background.fill( Qt::transparent );
+ mData->mIconButton->setBackground( HbIcon( background ) );
+ mData->mIconButton->setIcon( mCarousel.nonFavoriteIcon() );
+
+ Radio::connect( mData->mIconButton.data(), SIGNAL(clicked()),
+ &mCarousel, SLOT(toggleFavorite()));
+
+ mData->mNameLabel.reset( new RadioFadingLabel( this ) );
+ mData->mNameLabel->setAlignment( Qt::AlignCenter );
+ mData->mNameLabel->setObjectName( NAME_LABEL );
+ HbFontSpec spec = mData->mNameLabel->fontSpec();
+ spec.setRole( HbFontSpec::Primary );
+ spec.setTextHeight( 40 );
+ mData->mNameLabel->setFontSpec( spec );
+
+ spec.setRole( HbFontSpec::Secondary );
+
+ mData->mGenreLabel.reset( new RadioFadingLabel( this ) );
+ mData->mGenreLabel->setAlignment( Qt::AlignCenter );
+ mData->mGenreLabel->setObjectName( GENRE_LABEL );
+ mData->mGenreLabel->setTextColor( Qt::white );
+
+ mData->mRadiotextLabel.reset( new RadioFadingLabel( this ) );
+ mData->mRadiotextLabel->setAlignment( Qt::AlignCenter );
+ mData->mRadiotextLabel->setObjectName( RADIOTEXT_LABEL );
+ mData->mRadiotextLabel->setTextWrapping( Hb::TextWordWrap );
+// mRadiotextLabel->setFadingEnabled( true ); TODO
+// mRadiotextLabel->setFontSpec( spec );
+ mData->mRadiotextLabel->setTextColor( Qt::white );
+
+ mData->mUrlLabel.reset( new RadioFadingLabel( this ) );
+ mData->mUrlLabel->setAlignment( Qt::AlignCenter );
+ mData->mUrlLabel->setObjectName( URL_LABEL );
+ mData->mUrlLabel->setTextColor( Qt::white );
+
+ mData->mLayout = new HbAnchorLayout();
+ HbAnchorLayout* layout = mData->mLayout;
+
+ HbPushButton* iconButton = mData->mIconButton.data();
+ RadioFadingLabel* nameLabel = mData->mNameLabel.data();
+ RadioFadingLabel* genreLabel = mData->mGenreLabel.data();
+ RadioFadingLabel* urlLabel = mData->mUrlLabel.data();
+ RadioFadingLabel* radiotextLabel = mData->mRadiotextLabel.data();
+
+ layout->setAnchor( layout, Hb::TopEdge, iconButton, Hb::TopEdge, 20.0 );
+ layout->setAnchor( layout, Hb::LeftEdge, iconButton, Hb::LeftEdge, 20.0 );
+
+ layout->setAnchor( iconButton, Hb::CenterVEdge, genreLabel, Hb::CenterVEdge, 0.0 );
+ layout->setAnchor( iconButton, Hb::RightEdge, genreLabel, Hb::LeftEdge, 20.0 );
+ layout->setAnchor( layout, Hb::RightEdge, genreLabel, Hb::RightEdge, -70.0 );
+
+ layout->setAnchor( genreLabel, Hb::BottomEdge, nameLabel, Hb::TopEdge, 0.0 );
+ layout->setAnchor( layout, Hb::LeftEdge, nameLabel, Hb::LeftEdge, 10.0 );
+ layout->setAnchor( layout, Hb::RightEdge, nameLabel, Hb::RightEdge, -10.0 );
+
+ layout->setAnchor( nameLabel, Hb::BottomEdge, radiotextLabel, Hb::TopEdge, 10.0 );
+ layout->setAnchor( layout, Hb::LeftEdge, radiotextLabel, Hb::LeftEdge, 10.0 );
+ layout->setAnchor( layout, Hb::RightEdge, radiotextLabel, Hb::RightEdge, -10.0 );
+
+ layout->setAnchor( radiotextLabel, Hb::BottomEdge, urlLabel, Hb::TopEdge, 10.0 );
+ layout->setAnchor( layout, Hb::LeftEdge, urlLabel, Hb::LeftEdge, 10.0 );
+ layout->setAnchor( layout, Hb::RightEdge, urlLabel, Hb::RightEdge, -10.0 );
+ layout->setAnchor( layout, Hb::BottomEdge, urlLabel, Hb::BottomEdge, -10.0 );
+
+ setLayout( layout );
+}
+
+/*!
+ *
+ */
+RadioCarouselItem::~RadioCarouselItem()
+{
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setStation( const RadioStation& station )
+{
+ *mData->mStation = station;
+ update();
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::swapData( RadioCarouselItem& other )
+{
+ RadioCarouselItem::Data* tempData = mData.take();
+ mData.reset( other.mData.data() );
+ other.mData.reset( tempData );
+
+ other.setLayout( other.mData->mLayout );
+ setLayout( mData->mLayout );
+}
+
+/*!
+ *
+ */
+uint RadioCarouselItem::frequency() const
+{
+ return mData->mStation->frequency();
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::update( const RadioStation* station )
+{
+ if ( station ) {
+ *mData->mStation = *station;
+ }
+
+ if ( mData->mStation->isValid() ) {
+ mData->mNameLabel->setTextWithoutFading( mData->mStation->nameOrFrequencyMhz() );
+
+// mData->mGenreLabel->setText( "Rock Music" );
+// mData->mRadiotextLabel->setText( "This is a bit of radio text that should span many lines" );
+// mData->mUrlLabel->setText( "www.radiorock.fi" );
+
+ mData->mGenreLabel->setText( mCarousel.uiEngine()->genreToString( mData->mStation->genre(), GenreTarget::Carousel ) );
+
+ if ( !mData->mStation->radioText().isEmpty() ) {
+ mData->mRadiotextLabel->setText( mData->mStation->radioText() );
+ } else if ( !mData->mStation->dynamicPsText().isEmpty() ) {
+ mData->mRadiotextLabel->setText( mData->mStation->dynamicPsText() );
+ } else {
+ mData->mRadiotextLabel->setText( "" );
+ }
+
+ mData->mUrlLabel->setText( mData->mStation->url() );
+
+ updateFavoriteIcon( mData->mStation->isFavorite() );
+ } else {
+ cleanRdsData();
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setFrequency( uint frequency )
+{
+// LOG_FORMAT( "RadioCarouselItem::setFrequency: %d", frequency );
+
+ if ( !mCarousel.mManualSeekMode ) {
+ mData->mStation->setFrequency( frequency );
+ mData->mNameLabel->setTextWithoutFading( parseFrequency( frequency ) );
+ mData->mGenreLabel->setTextWithoutFading( "" );
+ mData->mRadiotextLabel->setTextWithoutFading( "" );
+ mData->mUrlLabel->setTextWithoutFading( "" );
+ updateFavoriteIcon( false );
+ } else {
+ mData->mNameLabel->setTextWithoutFading( parseFrequency( frequency ) );
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::cleanRdsData()
+{
+ if ( !mCarousel.mManualSeekMode ) {
+ mData->mNameLabel->setTextWithoutFading( "" );
+ }
+ mData->mGenreLabel->setTextWithoutFading( "" );
+ mData->mRadiotextLabel->setTextWithoutFading( "" );
+ mData->mUrlLabel->setTextWithoutFading( "" );
+ mData->mIconButton->setIcon( HbIcon( "" ) );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::handleLongPress( const QPointF& /*coords*/ )
+{
+// QString text = QString( "Selected frequency: %1" ).arg( mFrequency );
+// HbMessageBox::information( text );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setRadioText( const QString& text )
+{
+ mData->mRadiotextLabel->setHtml( text );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setSeekLayout( bool seekLayout )
+{
+ HbFontSpec spec = mData->mNameLabel->fontSpec();
+ mData->mSeekLayout = seekLayout;
+ if ( seekLayout ) {
+ cleanRdsData();
+ spec.setTextHeight( 60 );
+ } else {
+ spec.setTextHeight( 40 );
+ }
+ mData->mNameLabel->setFontSpec( spec );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setItemVisibility( ItemVisibility visibility )
+{
+ mData->mIconButton->setEnabled( true );
+ if ( visibility == AllVisible ) {
+ mData->mNameLabel->setVisible( true );
+ mData->mGenreLabel->setVisible( true );
+ mData->mRadiotextLabel->setVisible( true );
+ mData->mUrlLabel->setVisible( true );
+ mData->mIconButton->setVisible( true );
+ } else if ( visibility == AllHidden ) {
+ mData->mNameLabel->setVisible( false );
+ mData->mGenreLabel->setVisible( false );
+ mData->mRadiotextLabel->setVisible( false );
+ mData->mUrlLabel->setVisible( false );
+ mData->mIconButton->setVisible( false );
+ } else if ( visibility == IconVisible ) {
+ mData->mNameLabel->setVisible( false );
+ mData->mGenreLabel->setVisible( false );
+ mData->mRadiotextLabel->setVisible( false );
+ mData->mUrlLabel->setVisible( false );
+ mData->mIconButton->setVisible( true );
+ mData->mIconButton->setEnabled( false );
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setIconOpacity( qreal opacity )
+{
+ mData->mIconButton->setOpacity( opacity );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::updateFavoriteIcon( bool isFavorite )
+{
+ if ( !mData->mSeekLayout ) {
+ if ( isFavorite ) {
+ mData->mIconButton->setIcon( mCarousel.favoriteIcon() );
+ } else {
+ mData->mIconButton->setIcon( mCarousel.nonFavoriteIcon() );
+ }
+ } else {
+ mData->mIconButton->setIcon( HbIcon( "" ) );
+ }
+}
+
+/*!
+ *
+ */
+QString RadioCarouselItem::parseFrequency( const uint frequency )
+{
+ QString loc = "%L1 MHz";// hbTrId( "txt_rad_list_l1_mhz_big" );
+ return loc.arg( RadioStation::parseFrequency( frequency ) );
+}
+
+/*!
+ *
+ */
+QString RadioCarouselItem::nameOrFrequency( const RadioStation& station, uint frequency )
+{
+ if ( frequency == 0 ) {
+ frequency = station.frequency();
+ }
+
+ QString text = "";
+ if ( station.isValid() && !station.name().isEmpty() ) {
+ text = station.name();
+ } else {
+ text = parseFrequency( frequency );
+ }
+
+ return text;
+}
+
+/*!
+ *
+ */
+RadioCarouselItem::Data::Data() :
+ mLayout( NULL ),
+ mSeekLayout( false )
+{
+}
+
+/*!
+ *
+ */
+RadioCarouselItem::Data::~Data()
+{
+}
--- a/radioapp/radiowidgets/src/radiofadinglabel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiofadinglabel.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -20,11 +20,11 @@
// User includes
#include "radiofadinglabel.h"
#include "radiologger.h"
-#include "radiouiutilities.h"
+#include "radioutil.h"
// Constants
-const QString KHideEffect = "hide";
-const QString KShowEffect = "show";
+const QString HIDE_EFFECT = "hide";
+const QString SHOW_EFFECT = "show";
#ifdef USE_DEPRECATED_ORBIT_APIS
# define SET_CONTENT setText
@@ -42,9 +42,9 @@
mFadingEnabled( false )
{
QEffectList effectList;
-// effectList.append( EffectInfo( this, ":/effects/fade_in.fxml", KShowEffect ) );
-// effectList.append( EffectInfo( this, ":/effects/fade_out.fxml", KHideEffect ) );
- RadioUiUtilities::addEffects( effectList );
+// effectList.append( EffectInfo( this, ":/effects/fade_in.fxml", SHOW_EFFECT ) );
+// effectList.append( EffectInfo( this, ":/effects/fade_out.fxml", HIDE_EFFECT ) );
+ RadioUtil::addEffects( effectList );
}
/*!
@@ -78,15 +78,15 @@
if ( newText.isEmpty() ) {
if ( isVisible() ) {
mTextHolder = "";
- startEffect( KHideEffect, "effectFinished" );
+ startEffect( HIDE_EFFECT, "effectFinished" );
}
} else {
if ( GET_CONTENT().isEmpty() ) {
HbLabel::SET_CONTENT( trimHtml( newText ) );
- startEffect( KShowEffect );
+ startEffect( SHOW_EFFECT );
} else {
mTextHolder = newText;
- startEffect( KHideEffect, "effectFinished" );
+ startEffect( HIDE_EFFECT, "effectFinished" );
}
}
} else {
@@ -103,7 +103,7 @@
if ( status.reason == Hb::EffectFinished ) {
HbLabel::SET_CONTENT( trimHtml( mTextHolder ) );
if ( !mTextHolder.isEmpty() ) {
- HbEffect::start( this, KShowEffect );
+ HbEffect::start( this, SHOW_EFFECT );
}
mTextHolder = "";
}
--- a/radioapp/radiowidgets/src/radiofrequencyitem.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiofrequencyitem.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -21,12 +21,13 @@
#include "radiofrequencyitem.h"
#include "radiofrequencystrip.h"
#include "radio_global.h"
+#include "radiologger.h"
/*!
*
*/
RadioFrequencyItem::RadioFrequencyItem( QString frequency ) :
- mFrequency( frequency.isEmpty() ? 0 : frequency.toInt() * KOneHertz ),
+ mFrequency( frequency.isEmpty() ? 0 : frequency.toInt() * ONE_HERTZ ),
mGraphicsItem( 0 )
{
}
--- a/radioapp/radiowidgets/src/radiofrequencyscanner.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiofrequencyscanner.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -20,6 +20,7 @@
#include <QTimer>
#include <HbLabel>
#include <HbPushButton>
+#include <HbMessageBox>
// User includes
#include "radiofrequencyscanner.h"
@@ -29,11 +30,16 @@
#include "radiostationmodel.h"
#include "radiofrequencystrip.h"
#include "radiostationcarousel.h"
-#include "radiouiutilities.h"
+#include "radioutil.h"
#include "radiomainview.h"
// Constants
-const int KExtraRoomToMaxValue = 100000;
+const int EXTRA_TO_PROGRESS_MAX_VALUE = 100000;
+const int CAROUSEL_FINISH_SCROLL_TIME = 1000;
+const int STRIP_FINISH_SCROLL_TIME = 1100;
+const int CAROUSEL_SCROLL_TIME = 1000;
+const int STRIP_SCROLL_TIME = 1100;
+const int START_DELAY = 1000;
/*!
*
@@ -42,12 +48,16 @@
QObject( parent ),
mUiEngine( uiEngine ),
mInMainView( parent->metaObject()->className() == RadioMainView::staticMetaObject.className() ),
- mScannerEngine( mUiEngine.scannerEngine() ),
+ mScannerEngine( mUiEngine.createScannerEngine() ),
mStripScrollTime( 0 ),
mCarouselScrollTime( 0 ),
- mIsAlive( false )
+ mIsAlive( false ),
+ mUserCanceled( false )
{
- RadioUiUtilities::setFrequencyScanner( this );
+ RadioUtil::setFrequencyScanner( this );
+
+ Radio::connect( mScannerEngine.data(), SIGNAL(stationFound(RadioStation)),
+ this, SLOT(updateScanProgress(RadioStation)) );
}
/*!
@@ -55,6 +65,7 @@
*/
RadioFrequencyScanner::~RadioFrequencyScanner()
{
+ RadioUtil::setScanStatus( Scan::NotScanning );
}
/*!
@@ -63,43 +74,47 @@
void RadioFrequencyScanner::startScanning()
{
mIsAlive = true;
- RadioFrequencyStrip* frequencyStrip = RadioUiUtilities::frequencyStrip();
- RadioStationCarousel* carousel = RadioUiUtilities::carousel();
+ RadioFrequencyStrip* frequencyStrip = RadioUtil::frequencyStrip();
+ RadioStationCarousel* carousel = RadioUtil::carousel();
if ( mInMainView ) {
+
+ // If this is the first time start, bring application to foreground
+ if ( mUiEngine.isFirstTimeStart() ) {
+ static_cast<RadioMainView*>( parent() )->bringToForeground();
+ }
+
+ RadioUtil::setScanStatus( Scan::ScanningInMainView );
mStripScrollTime = frequencyStrip->autoScrollTime();
mCarouselScrollTime = carousel->autoScrollTime();
carousel->setScanningMode( true );
- carousel->setAutoScrollTime( 1000 );
- frequencyStrip->setAutoScrollTime( 1100 );
+ carousel->setAutoScrollTime( CAROUSEL_SCROLL_TIME );
+ frequencyStrip->setAutoScrollTime( STRIP_SCROLL_TIME );
- connectAndTest( carousel, SIGNAL(scanAnimationFinished()),
+ Radio::connect( carousel, SIGNAL(scanAnimationFinished()),
this, SLOT(continueScanning()) );
static_cast<RadioMainView*>( parent() )->setScanningMode( true );
frequencyStrip->setScanningMode( true );
} else {
- carousel->setCarouselModel( NULL );
-
- mScanningProgressNote.reset( new HbProgressDialog( HbProgressDialog::ProgressDialog ) ),
+ RadioUtil::setScanStatus( Scan::ScanningInStationsView );
+ mScanningProgressNote = new HbProgressDialog( HbProgressDialog::ProgressDialog );
mScanningProgressNote->setModal( true );
mScanningProgressNote->setAutoClose( true );
// Add some extra to the maximum value to allow room for the station at the low band edge
- mScanningProgressNote->setRange( mUiEngine.minFrequency(), mUiEngine.maxFrequency() + KExtraRoomToMaxValue );
+ mScanningProgressNote->setRange( mUiEngine.minFrequency(), mUiEngine.maxFrequency() + EXTRA_TO_PROGRESS_MAX_VALUE );
mScanningProgressNote->setProgressValue( mUiEngine.minFrequency() );
mScanningProgressNote->setText( hbTrId( "txt_rad_info_searching_local_stations_please_wait" ) );
- mScanningProgressNote->show();
+ mScanningProgressNote->setAttribute( Qt::WA_DeleteOnClose, true );
+ mScanningProgressNote->open();
- connectAndTest( mScanningProgressNote.data(), SIGNAL(cancelled()),
+ Radio::connect( mScanningProgressNote.data(), SIGNAL(cancelled()),
this, SLOT(cancelScanning()) );
}
- connectAndTest( mScannerEngine.data(), SIGNAL(stationFound(RadioStation)),
- this, SLOT(updateScanProgress(RadioStation)) );
-
- QTimer::singleShot( 1000, this, SLOT(delayedStart()) );
+ QTimer::singleShot( START_DELAY, this, SLOT(delayedStart()) );
}
/*!
@@ -116,6 +131,8 @@
*/
void RadioFrequencyScanner::cancelScanning()
{
+ mUserCanceled = true;
+ RadioUtil::carousel()->cancelAnimation();
finishScanning();
}
@@ -144,8 +161,8 @@
if ( mInMainView ) {
- RadioUiUtilities::frequencyStrip()->setFrequency( frequency, TuneReason::StationScan );
- RadioUiUtilities::carousel()->animateNewStation( station );
+ RadioUtil::frequencyStrip()->setFrequency( frequency, TuneReason::StationScan );
+ RadioUtil::carousel()->animateNewStation( station );
} else {
// Check for special case that can happen during scanning.
@@ -157,7 +174,7 @@
}
mScannerEngine->continueScanning();
- }
+ }
}
/*!
@@ -166,7 +183,10 @@
*/
void RadioFrequencyScanner::continueScanning()
{
- mScannerEngine->continueScanning();
+ if ( !mUserCanceled ) {
+ RadioUtil::frequencyStrip()->addScannedStation( mUiEngine.stationModel().currentStation() );
+ mScannerEngine->continueScanning();
+ }
}
/*!
@@ -176,9 +196,11 @@
void RadioFrequencyScanner::restoreUiControls()
{
if ( mInMainView ) {
- RadioUiUtilities::frequencyStrip()->setScanningMode( false );
+ disconnect( RadioUtil::carousel(), SIGNAL(scrollingEnded()), this, 0 );
+
+ RadioUtil::frequencyStrip()->setScanningMode( false );
static_cast<RadioMainView*>( parent() )->setScanningMode( false );
- RadioUiUtilities::carousel()->setScanningMode( false );
+ RadioUtil::carousel()->setScanningMode( false );
}
deleteLater();
@@ -190,38 +212,77 @@
void RadioFrequencyScanner::finishScanning()
{
mScannerEngine->cancel();
- RadioUiUtilities::setFrequencyScanner( NULL );
- mIsAlive = false;
- RadioFrequencyStrip* frequencyStrip = RadioUiUtilities::frequencyStrip();
- RadioStationCarousel* carousel = RadioUiUtilities::carousel();
+ RadioUtil::setScanStatus( Scan::NotScanning );
+ RadioUtil::setFrequencyScanner( NULL );
+ RadioFrequencyStrip* frequencyStrip = RadioUtil::frequencyStrip();
+ RadioStationCarousel* carousel = RadioUtil::carousel();
+
+ disconnect( mScannerEngine.data(), SIGNAL(stationFound(RadioStation)), this, 0 );
+
+ RadioStationModel& model = mUiEngine.stationModel();
+ const int stationCount = model.rowCount();
if ( mInMainView ) {
- RadioStationModel& model = mUiEngine.stationModel();
+
+ disconnect( carousel, SIGNAL(scanAnimationFinished()), this, 0 );
// Scroll the carousel and frequency strip through all of the scanned stations
- const int stationCount = model.rowCount();
if ( stationCount > 1 ) {
- frequencyStrip->setAutoScrollTime( 1000 );
- carousel->setAutoScrollTime( 1000 );
- const uint frequency = model.data( model.index( 0, 0 ), RadioStationModel::RadioStationRole ).value<RadioStation>().frequency();
- frequencyStrip->setFrequency( frequency, TuneReason::StationScan );
- carousel->setFrequency( frequency, TuneReason::StationScan );
+ frequencyStrip->setAutoScrollTime( STRIP_FINISH_SCROLL_TIME );
+ carousel->setAutoScrollTime( CAROUSEL_FINISH_SCROLL_TIME );
+
+ Radio::connect( carousel, SIGNAL(scrollingEnded()),
+ this, SLOT(restoreUiControls()) );
+
+ const uint frequency = model.stationAt( 0 ).frequency();
+ frequencyStrip->setFrequency( frequency, TuneReason::StationScanFinalize, Scroll::Right );
+ carousel->setFrequency( frequency, TuneReason::StationScanFinalize, Scroll::Right );
frequencyStrip->setAutoScrollTime( mStripScrollTime );
carousel->setAutoScrollTime( mCarouselScrollTime );
- }
+ } else {
+ const uint frequency = mUiEngine.minFrequency();
+ frequencyStrip->setFrequency( frequency, TuneReason::Unspecified );
+ carousel->setFrequency( frequency, TuneReason::Unspecified );
- QTimer::singleShot( 100, this, SLOT(restoreUiControls()) );
+ if ( !mUserCanceled ) {
+ HbMessageBox* box = new HbMessageBox( HbMessageBox::MessageTypeInformation );
+ box->setTimeout( HbPopup::NoTimeout );
+ box->setText( hbTrId( "txt_rad_dpophead_no_stations_found_try_searching" ) );
+ box->setDismissPolicy( HbPopup::NoDismiss );
+ box->setAttribute( Qt::WA_DeleteOnClose, true );
+ box->open();
+ }
+
+ restoreUiControls();
+ }
} else {
- mScanningProgressNote->setProgressValue( mScanningProgressNote->maximum() );
- deleteLater();
+ if ( !mUserCanceled ) {
+ if ( mScanningProgressNote ) {
+ mScanningProgressNote->setProgressValue( mScanningProgressNote->maximum() );
+ mScanningProgressNote->close();
+ }
- carousel->setCarouselModel( mUiEngine.carouselModel() );
+ if ( stationCount == 0 ) {
+ HbMessageBox* box = new HbMessageBox( HbMessageBox::MessageTypeInformation );
+ box->setTimeout( HbPopup::NoTimeout );
+ box->setText( hbTrId( "txt_rad_dpophead_no_stations_found_try_searching" ) );
+ box->setDismissPolicy( HbPopup::NoDismiss );
+ box->setAttribute( Qt::WA_DeleteOnClose, true );
+ box->open();
+ }
+ }
}
- disconnect( mScannerEngine.data(), SIGNAL(stationFound(RadioStation)),
- this, SLOT(updateScanAndSaveProgress(RadioStation)) );
+ mIsAlive = false;
+ emit frequencyScannerFinished();
- emit frequencyScannerFinished();
+ if ( !mInMainView ) {
+ if ( mUserCanceled ) {
+ deleteLater();
+ } else {
+ delete this; //TODO: Remove this weird hack once the problem with deleteLater is clear
+ }
+ }
}
--- a/radioapp/radiowidgets/src/radiofrequencystrip.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiofrequencystrip.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -31,46 +31,62 @@
#include "radiouiengine.h"
#include "radiostation.h"
#include "radiostationmodel.h"
-#include "radiouiutilities.h"
+#include "radioutil.h"
+#include "radiouiloader.h"
#include "radiologger.h"
// Frequency lines
-const int KTabHeightSmall = 10;
-const int KTabHeightBig = 15;
-const int KTabWidthFavorite = 4;
-const qreal KIndicatorWidth = 2.0;
+const int TAB_HEIGHT_SMALL = 10;
+const int TAB_HEIGHT_BIG = 15;
+const int PEN_WIDTH_FAVORITE = 4;
+const qreal INDICATOR_WIDTH = 2.0;
+
+const qreal ROUNDER = 0.5;
+const int SELECTOR_WIDTH = 2;
+const int SELECTOR_Z_POS = 100;
-const qreal KRounder = 0.5;
-const int KSelectorWidth = 2;
-const int KSelectorZPos = 100;
+const int HALF_HERTZ = ONE_HERTZ / 2;
+const int ONE_TAB_DISTANCE = 20;
+const uint ONE_TAB_IN_HZ = uint( 0.2 * ONE_HERTZ );
+const qreal PIXEL_IN_HZ = ONE_TAB_IN_HZ / ONE_TAB_DISTANCE;
+const qreal PIXMAP_OVERLAP = qreal( ONE_TAB_DISTANCE ) / 2;
+const int ITEM_WIDTH = ONE_TAB_DISTANCE * 5;
+const int PIXMAP_WIDTH = ITEM_WIDTH + (int)PIXMAP_OVERLAP;
+const int STRIP_HEIGHT = 50;
-const int KHalfHertz = KOneHertz / 2;
-const int KOneTabDistance = 15;
-const uint KOneTabInHz = 0.2 * KOneHertz;
-const qreal KPixelInHz = KOneTabInHz / KOneTabDistance;
-const int KWidth = KOneTabDistance * 5;
-//const int KPixmapWidth = KWidth + KOneTabDistance;
-const int KHeight = 50; //TODO: Remove hardcoding
+const uint ONE_HUNDRED_KHZ = 100000;
+
+const char* DECIMAL_TEXT = ".0";
-const int K100Khz = 100000;
+#ifdef BUILD_WIN32
+ const int FREQUENCY_FONT_SIZE = 12;
+ const int DECIMAL_FONT_SIZE = 8;
+#else
+ const int FREQUENCY_FONT_SIZE = 6;
+ const int DECIMAL_FONT_SIZE = 4;
+#endif // BUILD_WIN32
-const char* KSlideToLeft = "SlideToLeft";
-const char* KSlideFromLeft = "SlideFromLeft";
-const char* KSlideToRight = "SlideToRight";
-const char* KSlideFromRight = "SlideFromRight";
+const QFont FREQUENCY_FONT( "", FREQUENCY_FONT_SIZE );
+const QFont DECIMAL_FONT( "", DECIMAL_FONT_SIZE );
+
+const char* SLIDE_TO_LEFT = "SlideToLeft";
+const char* SLIDE_FROM_LEFT = "SlideFromLeft";
+const char* SLIDE_TO_RIGHT = "SlideToRight";
+const char* SLIDE_FROM_RIGHT = "SlideFromRight";
const char* LEFT_BUTTON = "tv:left_button";
const char* RIGHT_BUTTON = "tv:right_button";
const char* TEXT_COLOR_ATTRIBUTE = "text";
-const int BUTTON_HIDE_TIMEOUT = 500;
-const int BUTTON_SHOW_TIMEOUT = 1000;
+const int MANUALSEEK_START_TIMEOUT = 400;
+const int MANUALSEEK_END_TIMEOUT = 2000;
+const int MANUALSEEK_SIGNAL_DELAY = 300;
/*!
*
*/
static QLineF makeTab( qreal pos, int height )
{
- return QLineF( pos, KHeight - height, pos, KHeight );
+ return QLineF( pos, STRIP_HEIGHT - height, pos, STRIP_HEIGHT );
}
/*!
@@ -87,134 +103,93 @@
mSeparatorPos( 0.0 ),
mMaxWidth( 0 ),
mSelectorPos( 0.0 ),
- mLeftButton( new HbPushButton( this ) ),
- mRightButton( new HbPushButton( this ) ),
- mButtonTimer( NULL ),
- mButtonsVisible( true ),
- mUserIsScrolling( false ),
+ mLeftButton( 0 ),
+ mRightButton( 0 ),
+ mManualSeekTimer( NULL ),
+ mManualSeekMode( false ),
+ mLastReportedFrequency( 0 ),
+ mManualSeekTimerId( 0 ),
mForegroundColor( Qt::white )//HbColorScheme::color( TEXT_COLOR_ATTRIBUTE ) )
{
- RadioUiUtilities::setFrequencyStrip( this );
+ RadioUtil::setFrequencyStrip( this );
- setScrollingStyle( HbScrollArea::Pan );
- setItemSize( QSizeF( KWidth, KHeight ) );
- setFrictionEnabled( true );
+ setScrollingStyle( HbScrollArea::PanWithFollowOn );
+ setItemSize( QSizeF( ITEM_WIDTH + PIXMAP_OVERLAP / 2, STRIP_HEIGHT ) );
+ setOverlap( PIXMAP_OVERLAP / 2 );
initModel();
initSelector();
- initButtons();
+ initEmptyItems();
- initEmptyItems();
+ initPositions();
mFrequency = RadioUiEngine::lastTunedFrequency();
- scrollToFrequency( mFrequency, 0 );
-}
-
-/*!
- *
- */
-void RadioFrequencyStrip::setLeftButtonIcon( const HbIcon& leftButtonIcon )
-{
- mLeftButtonIcon = leftButtonIcon;
- if ( mLeftButton ) {
- mLeftButtonIcon.setColor( Qt::white );
- mLeftButton->setIcon( mLeftButtonIcon );
- }
-}
-
-/*!
- *
- */
-HbIcon RadioFrequencyStrip::leftButtonIcon() const
-{
- return mLeftButtonIcon;
-}
-
-/*!
- *
- */
-void RadioFrequencyStrip::setRightButtonIcon( const HbIcon& rightButtonIcon )
-{
- mRightButtonIcon = rightButtonIcon;
- if ( mRightButton ) {
- mRightButtonIcon.setColor( Qt::white );
- mRightButton->setIcon( mRightButtonIcon );
- }
}
/*!
*
*/
-HbIcon RadioFrequencyStrip::rightButtonIcon() const
-{
- return mRightButtonIcon;
-}
-
-/*!
- *
- */
-void RadioFrequencyStrip::init( RadioUiEngine* engine )
+void RadioFrequencyStrip::init( RadioUiEngine* engine, RadioUiLoader& uiLoader )
{
mUiEngine = engine;
mMinFrequency = mUiEngine->minFrequency();
mMaxFrequency = mUiEngine->maxFrequency();
mFrequencyStepSize = mUiEngine->frequencyStepSize();
- mFrequency = mUiEngine->currentFrequency();
- scrollToFrequency( mFrequency, 0 );
+
+ mLeftButton = uiLoader.findWidget<HbPushButton>( DOCML::MV_NAME_PREV_BUTTON );
+ mRightButton = uiLoader.findWidget<HbPushButton>( DOCML::MV_NAME_NEXT_BUTTON );
+ initButtons();
- mButtonTimer = new QTimer( this );
- mButtonTimer->setInterval( BUTTON_HIDE_TIMEOUT );
- mButtonTimer->setSingleShot( true );
- connectAndTest( mButtonTimer, SIGNAL(timeout()),
- this, SLOT(toggleButtons()) );
+ mManualSeekTimer = new QTimer( this );
+ mManualSeekTimer->setInterval( MANUALSEEK_START_TIMEOUT );
+ mManualSeekTimer->setSingleShot( true );
+ Radio::connect( mManualSeekTimer, SIGNAL(timeout()),
+ this, SLOT(toggleManualSeek()) );
- connectAndTest( mLeftButton, SIGNAL(clicked()),
+ Radio::connect( mLeftButton, SIGNAL(clicked()),
this, SLOT(handleLeftButton()) );
- connectAndTest( mRightButton, SIGNAL(clicked()),
+ Radio::connect( mRightButton, SIGNAL(clicked()),
this, SLOT(handleRightButton()) );
- connectAndTest( mLeftButton, SIGNAL(longPress(QPointF)),
+ Radio::connect( mLeftButton, SIGNAL(longPress(QPointF)),
this, SLOT(handleLongLeftButton()) );
- connectAndTest( mRightButton, SIGNAL(longPress(QPointF)),
+ Radio::connect( mRightButton, SIGNAL(longPress(QPointF)),
this, SLOT(handleLongRightButton()) );
- connectAndTest( this, SIGNAL(scrollingEnded()),
- this, SLOT(checkIllegalPos()) );
+ Radio::connect( this, SIGNAL(scrollingEnded()),
+ this, SLOT(handleScrollingEnd()) );
grabGesture( Qt::SwipeGesture );
//TODO: Remove. Stepsize hardcoded to 100 Khz in europe region during demo
- if ( mFrequencyStepSize < K100Khz ) {
- mFrequencyStepSize = K100Khz;
+ if ( mFrequencyStepSize < ONE_HUNDRED_KHZ ) {
+ mFrequencyStepSize = ONE_HUNDRED_KHZ;
}
RadioStationModel* stationModel = &mUiEngine->stationModel();
- connectAndTest( stationModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ Radio::connect( stationModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(updateStation(QModelIndex,int,int)) );
- connectAndTest( stationModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(updateStation(QModelIndex,int,int)) );
- connectAndTest( stationModel, SIGNAL(modelReset()),
+ Radio::connect( stationModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(removeStation(QModelIndex,int,int)) );
+ Radio::connect( stationModel, SIGNAL(modelReset()),
this, SLOT(initEmptyItems()) );
- initPositions();
+ updateAllItems();
- void updateItems();
+ showButtons();
}
/*!
*
*/
-void RadioFrequencyStrip::setFrequency( const uint frequency, int reason )
+void RadioFrequencyStrip::setFrequency( const uint frequency, int reason, Scroll::Direction direction )
{
+ Q_UNUSED( reason );
LOG_FORMAT( "RadioFrequencyStrip::setFrequency, frequency: %d, reason: %d", frequency, reason );
- if ( reason != TuneReason::FrequencyStrip && // Not sent by the FrequencyStrip
- frequency != mFrequency && // Different from the current
- mFrequencies.contains( frequency ) ) // 0 frequency means any illegal value
- {
- scrollToFrequency( frequency, mAutoScrollTime );
- if ( reason != TuneReason::Skip && reason != TuneReason::StationScan ) {
- emitFrequencyChanged( frequency );
+ if ( mFrequencies.contains( frequency ) ) {
+ if ( frequency != mFrequency || reason == TuneReason::Skip ) {
+ scrollToFrequency( frequency, direction, mAutoScrollTime, RadioUtil::tuneReason( reason ) );
}
}
}
@@ -228,14 +203,41 @@
}
/*!
- * Public slot
+ *
+ */
+bool RadioFrequencyStrip::isInManualSeekMode() const
+{
+ return mManualSeekMode;
+}
+
+/*!
+ *
+ */
+void RadioFrequencyStrip::cancelManualSeek()
+{
+ mManualSeekTimer->stop();
+ if ( mManualSeekMode ) {
+ toggleManualSeek();
+ }
+}
+
+/*!
+ *
+ */
+void RadioFrequencyStrip::addScannedStation( const RadioStation& station )
+{
+ FrequencyPos pos = mFrequencies.value( station.frequency() );
+ updateItem( pos.mItem, station.frequency() );
+}
+
+/*!
*
*/
void RadioFrequencyStrip::updateFavorite( const RadioStation& station )
{
LOG_SLOT_CALLER;
FrequencyPos pos = mFrequencies.value( station.frequency() );
- updateFavorites( pos.mItem );
+ updateItem( pos.mItem );
}
/*!
@@ -244,13 +246,13 @@
*/
void RadioFrequencyStrip::setScanningMode( bool isScanning )
{
- mButtonTimer->stop();
+ mManualSeekTimer->stop();
if ( isScanning ) {
- scrollToFrequency( mMinFrequency, mAutoScrollTime );
+ initEmptyItems();
hideButtons();
+ scrollToFrequency( mMinFrequency, Scroll::Shortest, mAutoScrollTime );
} else {
showButtons();
-
}
setEnabled( !isScanning );
}
@@ -259,19 +261,20 @@
* Private slot
*
*/
+void RadioFrequencyStrip::removeStation( const QModelIndex& parent, int first, int last )
+{
+ Q_UNUSED( parent );
+ updateStationsInRange( first, last, true );
+}
+
+/*!
+ * Private slot
+ *
+ */
void RadioFrequencyStrip::updateStation( const QModelIndex& parent, int first, int last )
{
Q_UNUSED( parent );
- RadioStationModel& model = mUiEngine->stationModel();
- uint frequency = 0;
- for ( int i = first; i <= last; ++i ) {
- frequency = model.data( model.index( i, 0, QModelIndex() ),
- RadioStationModel::RadioStationRole ).value<RadioStation>().frequency();
- if ( mFrequencies.contains( frequency ) ) {
- FrequencyPos pos = mFrequencies.value( frequency );
- updateFavorites( pos.mItem );
- }
- }
+ updateStationsInRange( first, last );
}
/*!
@@ -281,10 +284,13 @@
void RadioFrequencyStrip::initEmptyItems()
{
LOG_METHOD;
- QList<RadioStation> emptyList;
- foreach ( RadioFrequencyItem* item, mFrequencyItems ) {
- QPixmap pixmap = drawPixmap( item->frequency(), emptyList, item );
- item->setPixmap( pixmap );
+ //TODO: Remove the weird hack of checking the sender
+ if ( !sender() || RadioUtil::scanStatus() != Scan::ScanningInMainView ) {
+ QList<RadioStation> emptyList;
+ foreach ( RadioFrequencyItem* item, mFrequencyItems ) {
+ QPixmap pixmap = drawPixmap( item->frequency(), emptyList, item );
+ item->setPixmap( pixmap );
+ }
}
}
@@ -301,7 +307,7 @@
*/
void RadioFrequencyStrip::handleLongLeftButton()
{
- emit seekRequested( Seeking::Down );
+ emit seekRequested( Seek::Down );
}
/*!
@@ -317,36 +323,47 @@
*/
void RadioFrequencyStrip::handleLongRightButton()
{
- emit seekRequested( Seeking::Up );
+ emit seekRequested( Seek::Up );
}
/*!
* Private slot
+ *
*/
-void RadioFrequencyStrip::toggleButtons()
+void RadioFrequencyStrip::toggleManualSeek()
{
- if ( mButtonsVisible ) {
+ mManualSeekMode = !mManualSeekMode;
+ emit manualSeekChanged( mManualSeekMode );
+
+ if ( mManualSeekMode ) {
hideButtons();
+ mManualSeekTimerId = startTimer( MANUALSEEK_SIGNAL_DELAY );
} else {
showButtons();
+ killTimer( mManualSeekTimerId );
+ mManualSeekTimerId = 0;
}
}
/*!
* Private slot
*/
-void RadioFrequencyStrip::checkIllegalPos()
+void RadioFrequencyStrip::handleScrollingEnd()
{
// Check if the selector is in the invalid area where the strip loops around
const int selectorPosition = selectorPos();
- if ( !mPositions.contains( selectorPosition ) ) {
- if ( selectorPosition < mMaxWidth - KWidth + mSeparatorPos ) {
- scrollToFrequency( mMaxFrequency, 500 );
- emitFrequencyChanged( mMaxFrequency );
- } else {
- scrollToFrequency( mMinFrequency, 500 );
- emitFrequencyChanged( mMinFrequency );
+ if ( mManualSeekMode ) {
+ if ( !mPositions.contains( selectorPosition ) ) {
+ if ( selectorPosition < mMaxWidth - ITEM_WIDTH + mSeparatorPos ) {
+ scrollToFrequency( mMaxFrequency, Scroll::Shortest, 500 );
+ emit frequencyChanged( mMaxFrequency, TuneReason::ManualSeekUpdate, Scroll::Shortest );
+ } else {
+ scrollToFrequency( mMinFrequency, Scroll::Shortest, 500 );
+ emit frequencyChanged( mMinFrequency, TuneReason::ManualSeekUpdate, Scroll::Shortest );
+ }
}
+
+ mManualSeekTimer->start( MANUALSEEK_END_TIMEOUT );
}
}
@@ -376,9 +393,13 @@
{
Q_UNUSED( newPosition );
- if ( mUserIsScrolling ) {
+ if ( mManualSeekMode ) {
const int pos = selectorPos();
- emitFrequencyChanged( mPositions.value( pos ) );
+ const uint frequency = mPositions.value( pos );
+ if ( frequency > 0 ) {
+ mFrequency = mPositions.value( pos );
+ emit frequencyChanged( mFrequency, TuneReason::ManualSeekUpdate, Scroll::Shortest );
+ }
}
}
@@ -390,32 +411,29 @@
LOG_METHOD_ENTER;
RadioStripBase::resizeEvent( event );
- mSelectorPos = event->newSize().width() / 2;
- mSelectorImage->setOffset( mSelectorPos - (KIndicatorWidth / 2), 0.0 );
+ const qreal height = event->newSize().height();
+ const qreal width = event->newSize().width();
- const int stripHeight = event->newSize().height();
- if ( !mLeftButtonIcon.isNull() ) {
- mLeftButton->resize( stripHeight, stripHeight );
- mLeftButton->setBackground( mLeftButtonIcon );
+ mSelectorPos = width / 2;
+ mSelectorImage->setOffset( mSelectorPos - (INDICATOR_WIDTH / 2), 0.0 );
+
+ if ( mLeftButton && mRightButton ) {
+ mLeftButton->resize( height, height );
+ mRightButton->resize( height, height );
+ mRightButton->setPos( QPointF( width - height, 0 ) );
}
- if ( !mRightButtonIcon.isNull() ) {
- mRightButton->resize( stripHeight, stripHeight );
- mRightButton->setBackground( mRightButtonIcon );
- }
- mRightButton->setPos( QPointF( size().width() - mRightButton->size().width(), 0 ) );
-
- scrollToFrequency( mFrequency, 0 );
+ scrollToFrequency( mFrequency );
}
/*!
* \reimp
*/
-void RadioFrequencyStrip::showEvent( QShowEvent* event )
-{
- Q_UNUSED( event );
- scrollToFrequency( mFrequency, 0 );
-}
+//void RadioFrequencyStrip::showEvent( QShowEvent* event )
+//{
+// RadioStripBase::showEvent( event );
+// scrollToFrequency( mFrequency );
+//}
/*!
* \reimp
@@ -425,10 +443,10 @@
if ( event->type() == HbEvent::ThemeChanged ) {
// Update the foreground color and redraw each item
mForegroundColor = Qt::white;// HbColorScheme::color( TEXT_COLOR_ATTRIBUTE );
- updateItems();
+ updateAllItems();
}
- return HbWidgetBase::changeEvent(event);
+ return RadioStripBase::changeEvent(event);
}
/*!
@@ -437,9 +455,11 @@
void RadioFrequencyStrip::mousePressEvent( QGraphicsSceneMouseEvent* event )
{
RadioStripBase::mousePressEvent( event );
- mUserIsScrolling = true;
- mButtonTimer->stop();
- mButtonTimer->start( BUTTON_HIDE_TIMEOUT );
+
+ mManualSeekTimer->stop();
+ if ( !mManualSeekMode ) {
+ mManualSeekTimer->start( MANUALSEEK_START_TIMEOUT );
+ }
}
/*!
@@ -447,41 +467,11 @@
*/
void RadioFrequencyStrip::mouseReleaseEvent( QGraphicsSceneMouseEvent* event )
{
- mUserIsScrolling = false;
RadioStripBase::mouseReleaseEvent( event );
-// if ( !mIsPanGesture ) {
-// const qreal touchDelta = event->pos().x() - mSelectorPos;
-// const int touchPos = selectorPosition + touchDelta;
-// const uint frequencyAtPos = mPositions.value( touchPos );
-//
-// uint foundFrequency = 0;
-// for ( int i = 0; i < 10; ++i ) {
-// const uint delta = i * mFrequencyStepSize;
-// FrequencyPos leftFreq = mFrequencies.value( frequencyAtPos - delta );
-// FrequencyPos rightFreq = mFrequencies.value( frequencyAtPos + delta );
-//
-// if ( touchPos - leftFreq.mPosition > KTouchPosThreshold ) {
-// break;
-// }
-//
-// if ( leftFreq.mFavorite || leftFreq.mLocalStation ) {
-// foundFrequency = frequencyAtPos - delta;
-// break;
-// } else if ( rightFreq.mFavorite || rightFreq.mLocalStation ) {
-// foundFrequency = frequencyAtPos + delta;
-// break;
-// }
-// }
-//
-// if ( foundFrequency > 0 ) {
-// setFrequency( foundFrequency, 0 );
-// }
-// }
-
- mButtonTimer->stop();
- if ( !mButtonsVisible ) {
- mButtonTimer->start( BUTTON_SHOW_TIMEOUT );
+ mManualSeekTimer->stop();
+ if ( mManualSeekMode && !isScrolling() ) {
+ mManualSeekTimer->start( MANUALSEEK_END_TIMEOUT );
}
}
@@ -490,26 +480,39 @@
*/
void RadioFrequencyStrip::gestureEvent( QGestureEvent* event )
{
- if ( HbSwipeGesture* gesture = static_cast<HbSwipeGesture*>( event->gesture( Qt::SwipeGesture ) ) ) {
- if ( gesture->state() == Qt::GestureFinished ) {
- if ( gesture->horizontalDirection() == QSwipeGesture::Left ) {
+ HbSwipeGesture* swipeGesture = static_cast<HbSwipeGesture*>( event->gesture( Qt::SwipeGesture ) );
+ if ( swipeGesture && !mManualSeekMode ) {
+ if ( swipeGesture->state() == Qt::GestureFinished ) {
+ if ( swipeGesture->horizontalDirection() == QSwipeGesture::Left ) {
emit skipRequested( StationSkip::Next );
- } else if ( gesture->horizontalDirection() == QSwipeGesture::Right ) {
+ } else if ( swipeGesture->horizontalDirection() == QSwipeGesture::Right ) {
emit skipRequested( StationSkip::Previous );
}
}
- } else {
+ } else if ( mManualSeekMode ) {
RadioStripBase::gestureEvent( event );
}
}
/*!
+ * \reimp
+ */
+void RadioFrequencyStrip::timerEvent( QTimerEvent* event )
+{
+ Q_UNUSED( event );
+ if ( mLastReportedFrequency != mFrequency ) {
+ mLastReportedFrequency = mFrequency;
+ emit frequencyChanged( mFrequency, TuneReason::ManualSeekTune, Scroll::Shortest );
+ }
+}
+
+/*!
*
*/
void RadioFrequencyStrip::initModel()
{
- const uint minFreq = uint( qreal(mMinFrequency) / KOneHertz + KRounder );
- const uint maxFreq = uint( qreal(mMaxFrequency) / KOneHertz + 0.9 ); // always round up
+ const uint minFreq = uint( qreal(mMinFrequency) / ONE_HERTZ + ROUNDER );
+ const uint maxFreq = uint( qreal(mMaxFrequency) / ONE_HERTZ + 0.9 ); // always round up
QStringList list;
QString freqText;
@@ -521,13 +524,13 @@
mFrequencyItems.append( new RadioFrequencyItem( "" ) );
list.append( "" );
- mMaxWidth = list.count() * KWidth;
+ mMaxWidth = list.count() * ITEM_WIDTH;
- mSeparatorPos = qreal(KWidth) / 2;
- const uint minDrawableFreq = minFreq * KOneHertz - KHalfHertz;;
- const uint maxDrawableFreq = maxFreq * KOneHertz + KHalfHertz;
- mSeparatorPos += qreal( ( mMinFrequency - minDrawableFreq ) / 2 ) / KPixelInHz;
- mSeparatorPos -= qreal( ( maxDrawableFreq - mMaxFrequency ) / 2 ) / KPixelInHz;
+ mSeparatorPos = qreal(ITEM_WIDTH) / 2;
+ const uint minDrawableFreq = minFreq * ONE_HERTZ - HALF_HERTZ;;
+ const uint maxDrawableFreq = maxFreq * ONE_HERTZ + HALF_HERTZ;
+ mSeparatorPos += qreal( ( mMinFrequency - minDrawableFreq ) / 2 ) / PIXEL_IN_HZ;
+ mSeparatorPos -= qreal( ( maxDrawableFreq - mMaxFrequency ) / 2 ) / PIXEL_IN_HZ;
setModel( new QStringListModel( list, this ) );
}
@@ -537,10 +540,10 @@
*/
void RadioFrequencyStrip::initSelector()
{
- QPixmap selectorPixmap = QPixmap( QSize( KSelectorWidth, KHeight ) );
+ QPixmap selectorPixmap = QPixmap( QSize( SELECTOR_WIDTH, STRIP_HEIGHT ) );
selectorPixmap.fill( Qt::red );
mSelectorImage->setPixmap( selectorPixmap );
- mSelectorImage->setZValue( KSelectorZPos );
+ mSelectorImage->setZValue( SELECTOR_Z_POS );
}
/*!
@@ -572,17 +575,23 @@
*/
void RadioFrequencyStrip::initButtons()
{
- mLeftButton->setZValue( KSelectorZPos );
+ mLeftButton->setZValue( SELECTOR_Z_POS );
mLeftButton->setObjectName( LEFT_BUTTON );
- mRightButton->setZValue( KSelectorZPos );
+ mRightButton->setZValue( SELECTOR_Z_POS );
mRightButton->setObjectName( RIGHT_BUTTON );
+ const qreal height = size().height();
+ const qreal width = size().width();
+ mLeftButton->resize( height, height );
+ mRightButton->resize( height, height );
+ mRightButton->setPos( QPointF( width - height, 0 ) );
+
QEffectList effectList;
- effectList.append( EffectInfo( mLeftButton, ":/effects/slide_to_left.fxml", KSlideToLeft ) );
- effectList.append( EffectInfo( mLeftButton, ":/effects/slide_from_left.fxml", KSlideFromLeft ) );
- effectList.append( EffectInfo( mRightButton, ":/effects/slide_to_right.fxml", KSlideToRight ) );
- effectList.append( EffectInfo( mRightButton, ":/effects/slide_from_right.fxml", KSlideFromRight ) );
- RadioUiUtilities::addEffects( effectList );
+ effectList.append( EffectInfo( mLeftButton, ":/effects/slide_to_left.fxml", SLIDE_TO_LEFT ) );
+ effectList.append( EffectInfo( mLeftButton, ":/effects/slide_from_left.fxml", SLIDE_FROM_LEFT ) );
+ effectList.append( EffectInfo( mRightButton, ":/effects/slide_to_right.fxml", SLIDE_TO_RIGHT ) );
+ effectList.append( EffectInfo( mRightButton, ":/effects/slide_from_right.fxml", SLIDE_FROM_RIGHT ) );
+ RadioUtil::addEffects( effectList );
}
/*!
@@ -597,13 +606,43 @@
/*!
*
*/
-void RadioFrequencyStrip::updateFavorites( RadioFrequencyItem* item )
+void RadioFrequencyStrip::updateStationsInRange( int first, int last, bool stationRemoved )
+{
+ if ( RadioUtil::scanStatus() != Scan::ScanningInMainView ) {
+ RadioStationModel& model = mUiEngine->stationModel();
+ uint frequency = 0;
+ for ( int i = first; i <= last; ++i ) {
+ frequency = model.data( model.index( i, 0, QModelIndex() ),
+ RadioRole::RadioStationRole ).value<RadioStation>().frequency();
+ if ( mFrequencies.contains( frequency ) ) {
+ FrequencyPos pos = mFrequencies.value( frequency );
+ updateItem( pos.mItem, 0, stationRemoved ? frequency : 0 );
+ }
+ }
+ }
+}
+
+/*!
+ *
+ */
+void RadioFrequencyStrip::updateItem( RadioFrequencyItem* item, uint upperRange, uint ignoredFrequency )
{
if ( item ) {
uint frequency = item->frequency();
QList<RadioStation> stations;
+
+ if ( upperRange == 0 ) {
+ upperRange = frequency + HALF_HERTZ;
+ }
+
if ( mUiEngine ) {
- stations = mUiEngine->stationsInRange( frequency - KHalfHertz, frequency + KHalfHertz );
+ stations = mUiEngine->stationsInRange( frequency - HALF_HERTZ, upperRange );
+ for ( int i = stations.count() - 1; ignoredFrequency > 0 && i >= 0; --i ) {
+ if ( stations[i].frequency() == ignoredFrequency ) {
+ stations.removeAt( i );
+ break;
+ }
+ }
}
QPixmap pixmap = drawPixmap( frequency, stations, item );
@@ -620,10 +659,10 @@
/*!
*
*/
-void RadioFrequencyStrip::updateItems()
+void RadioFrequencyStrip::updateAllItems()
{
foreach ( RadioFrequencyItem* item, mFrequencyItems ) {
- updateFavorites( item );
+ updateItem( item );
}
}
@@ -632,7 +671,7 @@
*/
QPixmap RadioFrequencyStrip::drawPixmap( uint frequency, QList<RadioStation> stations, RadioFrequencyItem* item )
{
- QPixmap pixmap( KWidth, KHeight );
+ QPixmap pixmap( PIXMAP_WIDTH, STRIP_HEIGHT );
pixmap.fill( Qt::transparent );
QPainter painter( &pixmap );
QPen normalPen = painter.pen();
@@ -641,71 +680,72 @@
painter.setPen( normalPen );
if ( frequency == 0 ) {
- painter.drawLine( makeTab( mSeparatorPos - 1 + KRounder, KHeight ) );
- painter.drawLine( makeTab( mSeparatorPos + KRounder, KHeight ) );
+ painter.drawLine( makeTab( mSeparatorPos - 1 + ROUNDER, STRIP_HEIGHT ) );
+ painter.drawLine( makeTab( mSeparatorPos + ROUNDER, STRIP_HEIGHT ) );
return pixmap;
}
- const QString itemText = QString::number( frequency / KOneHertz );
- const uint startFrequency = frequency - KHalfHertz;
- const uint endFrequency = startFrequency + KOneHertz;
- const uint roundedMin = int( qreal(mMinFrequency) / KOneHertz + KRounder );
- const uint freq = frequency / KOneHertz;
+ const QString itemText = QString::number( frequency / ONE_HERTZ );
+ const uint startFrequency = frequency - HALF_HERTZ;
+ const uint endFrequency = startFrequency + ONE_HERTZ;
+ const uint roundedMin = int( qreal(mMinFrequency) / ONE_HERTZ + ROUNDER );
+ const uint freq = frequency / ONE_HERTZ;
const int diff = freq - roundedMin;
- const qreal startPixel = diff * KWidth;
+ const qreal startPixel = diff * ITEM_WIDTH;
qreal pixels = 0.0;
- QFont painterFont = painter.font();
- painterFont.setPointSize( 6 );
- painter.setFont( painterFont );
+ const qreal leftOverlap = PIXMAP_OVERLAP / 2;
- const int charWidth = painter.fontMetrics().averageCharWidth();
for ( uint frequency = startFrequency; frequency <= endFrequency; frequency += mFrequencyStepSize ) {
if ( frequency < mMinFrequency || frequency > mMaxFrequency ) {
continue;
}
- pixels = qreal( frequency - startFrequency ) / KPixelInHz;
- if ( frequency % KOneHertz == 0 ) {
+ pixels = qreal( frequency - startFrequency ) / PIXEL_IN_HZ;
+ if ( frequency % ONE_HERTZ == 0 ) {
// Draw the high frequency tab and the frequency text for the even number
- painter.drawLine( makeTab( pixels, KTabHeightBig ) );
- const int textPosX = pixels - itemText.length() * charWidth / 2;
+ painter.drawLine( makeTab( pixels + leftOverlap, TAB_HEIGHT_BIG ) );
+
+ // Draw the frequency text and its 00 decimals
+ painter.setFont( DECIMAL_FONT );
+ const int decimalWidth = painter.fontMetrics().width( DECIMAL_TEXT );
+ const int decimalSpace = painter.fontMetrics().leftBearing( '.' );
+ painter.setFont( FREQUENCY_FONT );
+ const int frequencyWidth = painter.fontMetrics().width( itemText );
+ const int textPosX = int( pixels + leftOverlap - ( frequencyWidth + decimalSpace + decimalWidth ) / 2 );
painter.drawText( QPoint( textPosX, 20 ), itemText );
+ painter.setFont( DECIMAL_FONT );
+ painter.drawText( QPoint( textPosX + frequencyWidth + decimalSpace, 20 ), DECIMAL_TEXT );
- } else if ( frequency % KOneTabInHz == 0 ) {
+ } else if ( frequency % ONE_TAB_IN_HZ == 0 ) {
// Draw the low frequency tab for the uneven number
- painter.drawLine( makeTab( pixels, KTabHeightSmall ) );
+ painter.drawLine( makeTab( pixels + leftOverlap, TAB_HEIGHT_SMALL ) );
}
- addFrequencyPos( startPixel + pixels + KRounder, frequency, item );
+ addFrequencyPos( int( startPixel + pixels + ROUNDER ), frequency, item );
}
// Draw favorites and local stations
favoritePen.setColor( Qt::yellow );
- const int markerYPos = KHeight - 20;
+ const int markerYPos = STRIP_HEIGHT - 20;
foreach ( const RadioStation& station, stations ) {
const uint frequency = station.frequency();
- pixels = qreal( frequency - startFrequency ) / KPixelInHz;
+ pixels = qreal( frequency - startFrequency ) / PIXEL_IN_HZ;
if ( station.isFavorite() ) {
- favoritePen.setWidth( KTabWidthFavorite );
+ favoritePen.setWidth( PEN_WIDTH_FAVORITE );
painter.setPen( favoritePen );
- painter.drawEllipse( pixels - 3, markerYPos - 3, 6, 6 );
+ painter.drawEllipse( int( pixels + leftOverlap - 3 ), markerYPos - 3, 6, 6 );
// painter.drawPixmap( pixels - 10, 20, 20, 20, mFavoriteIcon.pixmap() );
} else if ( station.isType( RadioStation::LocalStation ) ) {
-// painter.setPen( normalPen );
-// painter.drawLine( pixels, // Start X
-// KHeight - KTabHeightFavorite, // Start Y
-// pixels, // End X
-// KHeight ); // End Y
favoritePen.setWidth( 1 );
painter.setPen( favoritePen );
- painter.drawEllipse( pixels - 4, markerYPos - 4, 8, 8 );
+ painter.drawEllipse( int( pixels + leftOverlap - 4 ), markerYPos - 4, 8, 8 );
}
}
@@ -719,7 +759,8 @@
{
if ( frequency > 0 && frequency != mFrequency ) {
mFrequency = frequency;
- emit frequencyChanged( frequency, TuneReason::FrequencyStrip );
+ //TOD: Get direction
+ emit frequencyChanged( frequency, TuneReason::FrequencyStrip, Scroll::Shortest );
}
}
@@ -728,23 +769,54 @@
*/
int RadioFrequencyStrip::selectorPos() const
{
- const int pos = ( -contentWidget()->x() + mSelectorPos ) + KRounder;
+ const int pos = int( -contentWidget()->x() + mSelectorPos + ROUNDER );
return pos % mMaxWidth;
}
/*!
*
*/
-void RadioFrequencyStrip::scrollToFrequency( uint frequency, int time )
+void RadioFrequencyStrip::scrollToFrequency( uint frequency, Scroll::Direction direction, int time, TuneReason::Reason reason )
{
- // Find the shortest route to the requested frequency.
- const int pos = ( -contentWidget()->x() + mSelectorPos ) + KRounder;
- if ( pos >= mMaxWidth - KWidth + mSeparatorPos ) {
- const qreal newPos = qreal( mFrequencies.value( frequency ).mPosition ) - mSelectorPos + mMaxWidth;
- scrollContentsTo( QPointF( newPos, 0 ), time );
- } else {
- scrollContentsTo( QPointF( qreal( mFrequencies.value( frequency ).mPosition ) - mSelectorPos, 0 ), time );
+ int targetFreqPos = mFrequencies.value( frequency ).mPosition;
+ const int currentFreqPos = mFrequencies.value( mFrequency ).mPosition;
+ const int currentPos = int( -contentWidget()->x() + mSelectorPos + ROUNDER );
+ const bool isInSecondHalf = currentPos >= mMaxWidth - ITEM_WIDTH + mSeparatorPos;
+
+ // Special case: When there is only one favorite and the user presses skip
+ // the strip must scroll around to the same frequency.
+ if ( mFrequency == frequency && reason == TuneReason::Skip ) {
+ if ( direction == Scroll::Left ) {
+ targetFreqPos += mMaxWidth;
+ } else {
+ targetFreqPos -= mMaxWidth;
+ }
}
+
+ mFrequency = frequency;
+
+ qreal newPos = targetFreqPos;
+ if ( direction == Scroll::Left ) {
+
+ if ( currentFreqPos > targetFreqPos ) {
+ newPos += mMaxWidth;
+ }
+
+ } else if ( direction == Scroll::Right ) {
+
+ if ( currentFreqPos < targetFreqPos ) {
+ newPos -= mMaxWidth;
+ }
+
+ }
+
+ if ( isInSecondHalf ) {
+ newPos += mMaxWidth;
+ }
+
+ newPos -= mSelectorPos - ROUNDER;
+
+ scrollContentsTo( QPointF( newPos, 0 ), time );
}
/*!
@@ -752,9 +824,8 @@
*/
void RadioFrequencyStrip::hideButtons()
{
- mButtonsVisible = false;
- HbEffect::start( mLeftButton, KSlideToLeft );
- HbEffect::start( mRightButton, KSlideToRight );
+ HbEffect::start( mLeftButton, SLIDE_TO_LEFT );
+ HbEffect::start( mRightButton, SLIDE_TO_RIGHT );
}
/*!
@@ -762,7 +833,6 @@
*/
void RadioFrequencyStrip::showButtons()
{
- mButtonsVisible = true;
- HbEffect::start( mLeftButton, KSlideFromLeft );
- HbEffect::start( mRightButton, KSlideFromRight );
+ HbEffect::start( mLeftButton, SLIDE_FROM_LEFT );
+ HbEffect::start( mRightButton, SLIDE_FROM_RIGHT );
}
--- a/radioapp/radiowidgets/src/radiohistoryview.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiohistoryview.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -56,7 +56,7 @@
*
*/
RadioHistoryView::RadioHistoryView() :
- RadioViewBase( false ),
+ RadioViewBase(),
mHistoryList( 0 ),
mAllSongsButton( 0 ),
mTaggedSongsButton( 0 ),
@@ -110,15 +110,17 @@
* Private slot
*
*/
-void RadioHistoryView::deckButtonPressed()
+void RadioHistoryView::updateViewMode()
{
+ QString section = DOCML::HV_SECTION_HISTORY_MODE;
+ bool showTagged = false;
+
if ( sender() == mTaggedSongsButton ) {
- loadSection( DOCML::FILE_HISTORYVIEW, DOCML::HV_SECTION_FAVORITE_MODE );
- } else {
- loadSection( DOCML::FILE_HISTORYVIEW, DOCML::HV_SECTION_HISTORY_MODE );
+ section = DOCML::HV_SECTION_FAVORITE_MODE;
+ showTagged = true;
}
- const bool showTagged = mTaggedSongsButton->isChecked();
+ loadSection( DOCML::FILE_HISTORYVIEW, section );
historyModel().setShowTagged( showTagged );
updateVisibilities();
@@ -141,7 +143,7 @@
*/
void RadioHistoryView::updateVisibilities()
{
- const int itemCount = mMainWindow->uiEngine().historyModel().rowCount();
+ const int itemCount = mUiEngine->historyModel().rowCount();
loadSection( DOCML::FILE_HISTORYVIEW, itemCount ? DOCML::HV_SECTION_SHOW_LIST : DOCML::HV_SECTION_HIDE_LIST );
}
@@ -165,7 +167,7 @@
}
if ( HbAction* searchAction = mUiLoader->findObject<HbAction>( DOCML::HV_NAME_CONTEXT_SEARCH ) ) {
- //TODO: Check if "search from other store" should be available
+ //TODO: Add support for other music store
searchAction->setVisible( false );
}
@@ -181,11 +183,21 @@
* Private slot
*
*/
+void RadioHistoryView::handleLongPress( HbAbstractViewItem* item )
+{
+ showContextMenu( item->modelIndex() );
+}
+
+/*!
+ * Private slot
+ *
+ */
void RadioHistoryView::toggleTagging()
{
historyModel().toggleTagging( *mSelectedItem, mCurrentRow );
mSelectedItem->reset();
mCurrentRow = -1;
+ updateVisibilities();
}
/*!
@@ -196,7 +208,7 @@
{
QString msg = "To be implemented: Open ovi store. Artist: %1, Title: %2";
HbMessageBox::information( msg.arg( mSelectedItem->artist() ).arg( mSelectedItem->title() ) );
- mMainWindow->uiEngine().openMusicStore( *mSelectedItem );
+ mUiEngine->openMusicStore( *mSelectedItem );
}
/*!
@@ -207,7 +219,7 @@
{
QString msg = "To be implemented: Open other store. Artist: %1, Title: %2";
HbMessageBox::information( msg.arg( mSelectedItem->artist() ).arg( mSelectedItem->title() ) );
- mMainWindow->uiEngine().openMusicStore( *mSelectedItem, RadioUiEngine::OtherStore );
+ mUiEngine->openMusicStore( *mSelectedItem, RadioUiEngine::OtherStore );
}
/*!
@@ -230,8 +242,8 @@
Song song = KRecognizedSongs[mSongIndex++];
mSongIndex %= KSongsCount;
- RadioStation station = mMainWindow->uiEngine().stationModel().currentStation();
- mMainWindow->uiEngine().historyModel().addItem( song.mArtist, song.mTitle, station );
+ RadioStation station = mUiEngine->stationModel().currentStation();
+ mUiEngine->historyModel().addItem( song.mArtist, song.mTitle, station );
}
/*!
@@ -241,9 +253,8 @@
void RadioHistoryView::init()
{
LOG_METHOD;
- mInitialized = true;
- RadioHistoryModel* historyModel = &mMainWindow->uiEngine().historyModel();
+ RadioHistoryModel* historyModel = &mUiEngine->historyModel();
historyModel->setShowDetails( mOrientation == Qt::Horizontal );
if ( !mNonTaggedIcon.isNull() && !mTaggedIcon.isNull() ) {
@@ -260,27 +271,36 @@
mTaggedSongsButton = mUiLoader->findObject<HbAction>( DOCML::HV_NAME_TAGGED_SONGS_BUTTON );
if ( HbAction* clearListAction = mUiLoader->findObject<HbAction>( DOCML::HV_NAME_CLEAR_LIST_ACTION ) ) {
- connectAndTest( clearListAction, SIGNAL(triggered()),
+ Radio::connect( clearListAction, SIGNAL(triggered()),
this, SLOT(clearList()) );
}
- connectAndTest( mTaggedSongsButton, SIGNAL(triggered() ),
- this, SLOT(deckButtonPressed() ) );
- connectAndTest( mAllSongsButton, SIGNAL(triggered() ),
- this, SLOT(deckButtonPressed() ) );
- connectAndTest( historyModel, SIGNAL(itemAdded() ),
- this, SLOT(updateVisibilities() ) );
+ Radio::connect( mTaggedSongsButton, SIGNAL(triggered()),
+ this, SLOT(updateViewMode()) );
+ Radio::connect( mAllSongsButton, SIGNAL(triggered()),
+ this, SLOT(updateViewMode()) );
+ Radio::connect( historyModel, SIGNAL(itemAdded()),
+ this, SLOT(updateVisibilities()) );
+ Radio::connect( mHistoryList, SIGNAL(activated(QModelIndex)),
+ this, SLOT(showContextMenu(QModelIndex)) );
+ Radio::connect( mHistoryList, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)),
+ this, SLOT(handleLongPress(HbAbstractViewItem*)) );
- loadSection( DOCML::FILE_HISTORYVIEW, DOCML::HV_SECTION_HISTORY_MODE );
- updateVisibilities();
-
+ connectCommonMenuItem( MenuItem::Exit );
connectCommonMenuItem( MenuItem::UseLoudspeaker );
+ // Context menu actions
+ connectXmlElement( DOCML::HV_NAME_TOGGLE_TAG_ACTION, SIGNAL(triggered()),
+ this, SLOT(toggleTagging()) );
+ connectXmlElement( DOCML::HV_NAME_OVI_STORE_ACTION, SIGNAL(triggered()),
+ this, SLOT(openOviStore()) );
initBackAction();
+ updateViewMode();
+
// BEGIN TEMPORARY TEST CODE
if ( HbAction* addSongsAction = mUiLoader->findObject<HbAction>( "hv:add_songs_action" ) ) {
- connectAndTest( addSongsAction, SIGNAL(triggered()),
+ Radio::connect( addSongsAction, SIGNAL(triggered()),
this, SLOT(addSongs()) );
}
// END TEMPORARY TEST CODE
@@ -292,8 +312,10 @@
*/
void RadioHistoryView::setOrientation()
{
- RadioHistoryModel& model = mMainWindow->uiEngine().historyModel();
- model.setShowDetails( mOrientation == Qt::Horizontal );
+ if ( mUiEngine ) {
+ RadioHistoryModel& model = mUiEngine->historyModel();
+ model.setShowDetails( mOrientation == Qt::Horizontal );
+ }
}
/*!
@@ -302,7 +324,8 @@
*/
void RadioHistoryView::userAccepted()
{
- mMainWindow->uiEngine().historyModel().removeAll();
+ const bool removeTagged = mTaggedSongsButton->isChecked();
+ mUiEngine->historyModel().removeAll( removeTagged );
updateVisibilities();
}
--- a/radioapp/radiowidgets/src/radiomainview.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiomainview.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -20,6 +20,8 @@
#include <HbLabel>
#include <HbPushButton>
#include <HbAction>
+#include <HbMenu>
+#include <QApplication>
// User includes
#include "radiowindow.h"
@@ -29,7 +31,7 @@
#include "radiologger.h"
#include "radiostationcarousel.h"
#include "radiouiloader.h"
-#include "radiouiutilities.h"
+#include "radioutil.h"
#include "radiostationmodel.h"
#include "radiofrequencyscanner.h"
@@ -41,7 +43,9 @@
RadioMainView::RadioMainView() :
RadioViewBase( false ),
mCarousel( NULL ),
- mFrequencyStrip( NULL )
+ mFrequencyStrip( NULL ),
+ mSkippingAction( NULL ),
+ mAlternateSkipping( false )
{
}
@@ -63,6 +67,12 @@
} else {
loadSection( DOCML::FILE_MAINVIEW, DOCML::MV_SECTION_NORMAL );
mFrequencyScanner.take();
+
+ const bool firsTimeStart = mUiEngine->isFirstTimeStart();
+ const int rowCount = mUiEngine->stationModel().rowCount();
+ if ( firsTimeStart && rowCount != 0 ) {
+ mUiEngine->setFirstTimeStartPerformed( true );
+ }
}
}
@@ -73,67 +83,81 @@
void RadioMainView::init()
{
LOG_METHOD;
- mInitialized = true;
+ loadSection( DOCML::FILE_MAINVIEW, DOCML::SECTION_LAZY_LOAD );
mCarousel = mUiLoader->findObject<RadioStationCarousel>( DOCML::MV_NAME_STATION_CAROUSEL );
- mCarousel->init( *mUiLoader, &mMainWindow->uiEngine() );
+ mCarousel->init( *mUiLoader, mUiEngine.data() );
// Note! UI connections are already made in the DocML file. Here we need to connect UI to engine
- RadioUiEngine* engine = &mMainWindow->uiEngine();
mFrequencyStrip = mUiLoader->findObject<RadioFrequencyStrip>( DOCML::MV_NAME_FREQUENCY_STRIP );
- mFrequencyStrip->init( engine );
-
- RadioStationModel* stationModel = &engine->stationModel();
+ mFrequencyStrip->init( mUiEngine.data(), *mUiLoader );
- connectAndTest( mFrequencyStrip, SIGNAL(frequencyChanged(uint,int)),
- this, SLOT(setFrequencyFromWidget(uint,int)) );
- connectAndTest( mCarousel, SIGNAL(frequencyChanged(uint,int)),
- this, SLOT(setFrequencyFromWidget(uint,int)) );
- connectAndTest( engine, SIGNAL(tunedToFrequency(uint,int)),
- this, SLOT(setFrequencyFromEngine(uint,int)) );
+ RadioStationModel* stationModel = &mUiEngine->stationModel();
- connectAndTest( mFrequencyStrip, SIGNAL(skipRequested(int)),
- this, SLOT(skip(int)) );
- connectAndTest( mFrequencyStrip, SIGNAL(seekRequested(int)),
- engine, SLOT(seekStation(int)) );
+ Radio::connect( mFrequencyStrip, SIGNAL(frequencyChanged(uint,int,int)),
+ this, SLOT(setFrequencyFromWidget(uint,int,int)) );
+ Radio::connect( mCarousel, SIGNAL(frequencyChanged(uint,int,int)),
+ this, SLOT(setFrequencyFromWidget(uint,int,int)) );
+ Radio::connect( mUiEngine.data(), SIGNAL(tunedToFrequency(uint,int)),
+ this, SLOT(setFrequencyFromEngine(uint,int)) );
+ Radio::connect( mFrequencyStrip, SIGNAL(manualSeekChanged(bool)),
+ this, SLOT(setManualSeekMode(bool)) );
- connectAndTest( stationModel, SIGNAL(favoriteChanged(RadioStation)),
- mFrequencyStrip, SLOT(updateFavorite(RadioStation)) );
+ Radio::connect( mFrequencyStrip, SIGNAL(skipRequested(int)),
+ this, SLOT(skip(int)) );
+ Radio::connect( mCarousel, SIGNAL(skipRequested(int)),
+ this, SLOT(skip(int)) );
+ Radio::connect( mFrequencyStrip, SIGNAL(seekRequested(int)),
+ mUiEngine.data(), SLOT(seekStation(int)) );
- connectAndTest( engine, SIGNAL(seekingStarted(int)),
+ Radio::connect( mUiEngine.data(), SIGNAL(seekingStarted(int)),
this, SLOT(seekingStarted()) );
- connectAndTest( engine, SIGNAL(antennaStatusChanged(bool)),
- mCarousel, SLOT(updateAntennaStatus(bool)) );
- connectAndTest( engine, SIGNAL(audioRouteChanged(bool)),
+ Radio::connect( mUiEngine.data(), SIGNAL(antennaStatusChanged(bool)),
+ this, SLOT(updateAntennaStatus(bool)) );
+ Radio::connect( mUiEngine.data(), SIGNAL(audioRouteChanged(bool)),
this, SLOT(updateAudioRoute(bool)) );
- HbPushButton* stationsButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_STATIONS_BUTTON );
- connectAndTest( stationsButton, SIGNAL(clicked()),
- mMainWindow, SLOT(activateStationsView()) );
+ Radio::connect( stationModel, SIGNAL(favoriteChanged(RadioStation)),
+ this, SLOT(handleFavoriteChange(RadioStation)) );
+
+ connectXmlElement( DOCML::MV_NAME_STATIONS_BUTTON, SIGNAL(clicked()),
+ mMainWindow, SLOT(activateStationsView()) );
- HbPushButton* scanButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_SCAN_BUTTON );
- connectAndTest( scanButton, SIGNAL(clicked()),
- this, SLOT(toggleScanning()) );
+ connectXmlElement( DOCML::MV_NAME_SCAN_BUTTON, SIGNAL(clicked()),
+ this, SLOT(toggleScanning()) );
- HbPushButton* loudspeakerButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_SPEAKER_BUTTON );
- connectAndTest( loudspeakerButton, SIGNAL(clicked()),
- engine, SLOT(toggleAudioRoute()) );
+ connectXmlElement( DOCML::MV_NAME_SPEAKER_BUTTON, SIGNAL(clicked()),
+ mUiEngine.data(), SLOT(toggleAudioRoute()) );
+
+ connectCommonMenuItem( MenuItem::Exit );
// "Play history" menu item
connectViewChangeMenuItem( DOCML::MV_NAME_HISTORYVIEW_ACTION, SLOT(activateHistoryView()) );
- updateAudioRoute( mMainWindow->uiEngine().isUsingLoudspeaker() );
+ //TODO: REMOVE. THIS IS TEMPORARY TEST CODE
+ toggleSkippingMode();
+ menu()->addAction( "Reset start count", this, SLOT(resetFirstTimeCount()) );
+ // END TEMPORARY TEST CODE
+
+ updateAudioRoute( mUiEngine->isUsingLoudspeaker() );
// Add "back" navigation action to put the application to background
HbAction* backAction = new HbAction( Hb::BackNaviAction, this );
- connectAndTest( backAction, SIGNAL(triggered()),
+#ifdef BUILD_WIN32
+ Radio::connect( backAction, SIGNAL(triggered()),
+ this, SLOT(quit()) );
+#else
+ Radio::connect( backAction, SIGNAL(triggered()),
mMainWindow, SLOT(lower()) );
+#endif // BUILD_WIN32
setNavigationAction( backAction );
- const bool firsTimeStart = engine->isFirstTimeStart();
- const int rowCount = engine->stationModel().rowCount();
+ const bool firsTimeStart = mUiEngine->isFirstTimeStart();
+ const int rowCount = mUiEngine->stationModel().rowCount();
if ( firsTimeStart && rowCount == 0 ){
QTimer::singleShot( 100, this, SLOT(toggleScanning()) );
}
+
+ emit applicationReady();
}
/*!
@@ -143,6 +167,9 @@
void RadioMainView::setOrientation()
{
loadSection( DOCML::FILE_MAINVIEW, mMainWindow->orientationSection() );
+ if ( mCarousel && mFrequencyStrip ) {
+ mCarousel->setFrequency( mFrequencyStrip->frequency(), TuneReason::Unspecified );
+ }
}
/*!
@@ -151,23 +178,41 @@
*/
void RadioMainView::userAccepted()
{
- mFrequencyScanner.reset( new RadioFrequencyScanner( mMainWindow->uiEngine(), this ) );
+ mFrequencyScanner.reset( new RadioFrequencyScanner( *mUiEngine, this ) );
mFrequencyScanner->startScanning();
}
/*!
+ * \reimp
+ *
+ */
+bool RadioMainView::eventFilter( QObject* watched, QEvent* event )
+{
+ if ( event->type() == QEvent::ApplicationDeactivate ) {
+ mFrequencyStrip->cancelManualSeek();
+ }
+
+ return RadioViewBase::eventFilter( watched, event );
+}
+
+/*!
* Private slot
*/
-void RadioMainView::setFrequencyFromWidget( uint frequency, int reason )
+void RadioMainView::setFrequencyFromWidget( uint frequency, int reason, int direction )
{
- LOG_FORMAT( "RadioMainView::setFrequencyFromWidget: %u, reason = %d", frequency, reason );
- if ( !RadioUiUtilities::isScannerAlive() ) {
+// LOG_FORMAT( "RadioMainView::setFrequencyFromWidget: %u, reason = %d", frequency, reason );
+ if ( !RadioUtil::isScannerAlive() ) {
if ( reason == TuneReason::FrequencyStrip ) {
- mCarousel->setFrequency( frequency, reason );
- mMainWindow->uiEngine().tuneWithDelay( frequency, reason );
+// mCarousel->setFrequency( frequency, reason, direction );
+// mUiEngine->tuneWithDelay( frequency, reason );
+ } else if ( reason == TuneReason::ManualSeekUpdate ) {
+ mCarousel->setFrequency( frequency, reason, RadioUtil::scrollDirection( direction ) );
+ } else if ( reason == TuneReason::ManualSeekTune ) {
+ LOG_FORMAT( "--------Manual seek tune: %u", frequency );
+ mUiEngine->setFrequency( frequency, reason );
} else if ( reason == TuneReason::StationCarousel ) {
- mFrequencyStrip->setFrequency( frequency, reason );
- mMainWindow->uiEngine().tuneFrequency( frequency, reason );
+ mFrequencyStrip->setFrequency( frequency, reason, RadioUtil::scrollDirection( direction ) );
+ mUiEngine->setFrequency( frequency, reason );
}
}
}
@@ -177,13 +222,14 @@
*/
void RadioMainView::setFrequencyFromEngine( uint frequency, int reason )
{
- if ( !RadioUiUtilities::isScannerAlive() ) {
+ LOG_FORMAT( "RadioMainView::setFrequencyFromEngine reason: %d", reason );
+ if ( !RadioUtil::isScannerAlive() && !mFrequencyStrip->isInManualSeekMode() ) {
mCarousel->clearInfoText();
if ( reason != TuneReason::FrequencyStrip &&
reason != TuneReason::StationCarousel &&
reason != TuneReason::Skip ) {
- mCarousel->setFrequency( frequency, reason );
- mFrequencyStrip->setFrequency( frequency, reason );
+ mCarousel->setFrequency( frequency, reason, Scroll::Shortest );
+ mFrequencyStrip->setFrequency( frequency, reason, Scroll::Shortest );
}
}
}
@@ -193,16 +239,48 @@
*/
void RadioMainView::skip( int skipMode )
{
- if ( ( skipMode == StationSkip::PreviousFavorite || skipMode == StationSkip::NextFavorite ) &&
- mMainWindow->uiEngine().stationModel().favoriteCount() == 0 ) {
- mCarousel->setInfoText( CarouselInfoText::NoFavorites );
- } else {
+// if ( !mAlternateSkipping && ( skipMode == StationSkip::PreviousFavorite || skipMode == StationSkip::NextFavorite ) &&
+// mUiEngine->stationModel().favoriteCount() == 0 ) {
+// mCarousel->setInfoText( CarouselInfoText::NoFavorites );
+// } else {
const uint currentFrequency = mFrequencyStrip->frequency();
- const uint frequency = mMainWindow->uiEngine().skipStation( static_cast<StationSkip::Mode>( skipMode ),
- currentFrequency);
- mCarousel->setFrequency( frequency, TuneReason::Skip );
- mFrequencyStrip->setFrequency( frequency, TuneReason::Skip );
- }
+ RadioStation station;
+ mUiEngine->stationModel().findFrequency( currentFrequency, station );
+
+ if ( mAlternateSkipping ) { //TODO: Remove. Temporary test code
+ if ( sender() == mFrequencyStrip ) {
+ if ( skipMode == StationSkip::NextFavorite ) {
+ skipMode = StationSkip::Next;
+ } else if ( skipMode == StationSkip::PreviousFavorite ) {
+ skipMode = StationSkip::Previous;
+ }
+ } else if ( sender() == mCarousel ) {
+ if ( skipMode == StationSkip::Next ) {
+ skipMode = StationSkip::NextFavorite;
+ } else if ( skipMode == StationSkip::Previous ) {
+ skipMode = StationSkip::PreviousFavorite;
+ }
+ }
+ }
+
+ const uint frequency = mUiEngine->skipStation( static_cast<StationSkip::Mode>( skipMode ),
+ currentFrequency);
+
+ if ( currentFrequency != frequency || station.isFavorite() ) {
+ const Scroll::Direction direction = RadioUtil::scrollDirectionFromSkipMode( skipMode );
+ mCarousel->setFrequency( frequency, TuneReason::Skip, direction );
+ mFrequencyStrip->setFrequency( frequency, TuneReason::Skip, direction );
+ }
+// }
+}
+
+/*!
+ * Private slot
+ */
+void RadioMainView::openStationsView()
+{
+ mFrequencyStrip->cancelManualSeek();
+ mMainWindow->activateStationsView();
}
/*!
@@ -210,10 +288,11 @@
*/
void RadioMainView::toggleScanning()
{
+ mFrequencyStrip->cancelManualSeek();
if ( mFrequencyScanner ) {
mFrequencyScanner->cancelScanning();
} else {
- const int rowCount = mMainWindow->uiEngine().stationModel().rowCount();
+ const int rowCount = mUiEngine->stationModel().rowCount();
if ( rowCount > 0 ) {
askQuestion( hbTrId( "txt_rad_info_all_stations_in_stations_list_will_be" ) );
} else {
@@ -227,7 +306,7 @@
*/
void RadioMainView::seekingStarted()
{
- if ( !RadioUiUtilities::isScannerAlive() ) {
+ if ( !RadioUtil::isScannerAlive() ) {
mCarousel->setInfoText( CarouselInfoText::Seeking );
}
}
@@ -235,14 +314,83 @@
/*!
* Private slot
*/
+void RadioMainView::updateAntennaStatus( bool connected )
+{
+ if ( !connected ) {
+ mFrequencyStrip->cancelManualSeek();
+ }
+
+ HbPushButton* scanButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_SCAN_BUTTON );
+ scanButton->setEnabled( connected );
+ mCarousel->updateAntennaStatus( connected );
+}
+
+/*!
+ * Private slot
+ */
void RadioMainView::updateAudioRoute( bool loudspeaker )
{
HbPushButton* loudspeakerButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_SPEAKER_BUTTON );
if ( loudspeaker ) {
- loudspeakerButton->setIcon( HbIcon( "qtg_mono_speaker_off.svg" ) );
+ loudspeakerButton->setIcon( HbIcon( "qtg_mono_speaker_off" ) );
loudspeakerButton->setText( hbTrId( "txt_rad_button_deactivate_loudspeaker" ) );
} else {
- loudspeakerButton->setIcon( HbIcon( "qtg_mono_speaker.svg" ) );
+ loudspeakerButton->setIcon( HbIcon( "qtg_mono_speaker" ) );
loudspeakerButton->setText( hbTrId( "txt_rad_button_activate_loudspeaker" ) );
}
}
+
+/*!
+ * Private slot
+ */
+void RadioMainView::setManualSeekMode( bool manualSeekActive )
+{
+ if ( manualSeekActive ) {
+ qApp->installEventFilter( this );
+ } else {
+ qApp->removeEventFilter( this );
+ }
+
+ mUiEngine->setManualSeekMode( manualSeekActive );
+
+ mCarousel->setManualSeekMode( manualSeekActive );
+}
+
+/*!
+ * Private slot
+ */
+void RadioMainView::handleFavoriteChange( const RadioStation& station )
+{
+ mFrequencyStrip->updateFavorite( station );
+ if ( station.isFavorite() ) {
+ RadioUtil::showDiscreetNote( "Station added to Favourites." );
+ } else {
+ RadioUtil::showDiscreetNote( "Station removed from Favourites." );
+ }
+}
+
+/*!
+ * Private slot
+ */
+void RadioMainView::toggleSkippingMode()
+{
+ if ( !mSkippingAction ) {
+ mSkippingAction = menu()->addAction( "", this, SLOT(toggleSkippingMode()) );
+ }
+
+ mAlternateSkipping = !mAlternateSkipping;
+ mCarousel->setAlternateSkippingMode( mAlternateSkipping );
+ if ( mAlternateSkipping ) {
+ mSkippingAction->setText( "Normal skipping mode" );
+ } else {
+ mSkippingAction->setText( "Alternate skipping mode" );
+ }
+}
+
+/*!
+ * Private slot
+ */
+void RadioMainView::resetFirstTimeCount()
+{
+ mUiEngine->setFirstTimeStartPerformed( false );
+}
--- a/radioapp/radiowidgets/src/radiostationcarousel.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiostationcarousel.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -17,126 +17,70 @@
// System includes
#include <QGraphicsLinearLayout>
-#include <HbAnchorLayout>
-#include <QPixmap>
-#include <QGraphicsSceneMouseEvent>
-#include <HbEffect>
+#include <QGraphicsSceneResizeEvent>
#include <QTimer>
-#include <QTimeLine>
#include <HbPanGesture>
+#include <HbSwipeGesture>
+#include <HbFontSpec>
// User includes
#include "radiostationcarousel.h"
+#include "radiocarouselanimator.h"
#include "radiouiloader.h"
-#include "radiostationitem.h"
+#include "radiocarouselitem.h"
#include "radiostation.h"
#include "radiouiengine.h"
#include "radiostationmodel.h"
#include "radiofadinglabel.h"
#include "radiologger.h"
-#include "radiocarouselmodel.h"
-#include "radiouiutilities.h"
+#include "radioutil.h"
#include "radio_global.h"
-#ifdef USE_LAYOUT_FROM_E_DRIVE
- const QString KFavoriteIconPath = "e:/radiotest/images/favoriteiconactive.png";
- const QString KNonFavoriteIconPath = "e:/radiotest/images/favoriteiconinactive.png";
-#else
- const QString KFavoriteIconPath = ":/images/favoriteiconactive.png";
- const QString KNonFavoriteIconPath = ":/images/favoriteiconinactive.png";
-#endif
-
-const int KRadioTextPlusCheckTimeout = 700; // 700 ms
-const int KFreqScrollDivider = 100000;
-const int INFOTEXT_NOFAVORITES_TIMEOUT = 15000;
-
-// ===============================================================
-// Scanning helper
-// ===============================================================
+// Constants
+const int RTPLUS_CHECK_TIMEOUT = 700;
+const int INFOTEXT_NOFAVORITES_TIMEOUT = 5000;
+const int SET_FREQUENCY_TIMEOUT = 500;
+const int FAVORITE_HINT_SHOW_DELAY = 1000;
+const int FAVORITE_HINT_HIDE_DELAY = 2000;
-/*!
- *
- */
-ScanningHelper::ScanningHelper( RadioStationCarousel& carousel ) :
- mCarousel( carousel ),
- mCurrentFrequency( 0 ),
- mPreviousFrequency( 0 ),
- mStationItem( 0 ),
- mNumberScrollingTimeLine( new QTimeLine( 1000, this ) )
-{
- mNumberScrollingTimeLine->setCurveShape( QTimeLine::EaseInCurve );
- connectAndTest( mNumberScrollingTimeLine, SIGNAL(finished()),
- &mCarousel, SIGNAL(scanAnimationFinished()) );
- connectAndTest( mNumberScrollingTimeLine, SIGNAL(frameChanged(int)),
- this, SLOT(numberScrollUpdate(int)) );
-}
+#ifdef BUILD_WIN32
+# define SCROLLBAR_POLICY ScrollBarAlwaysOn
+#else
+# define SCROLLBAR_POLICY ScrollBarAlwaysOff
+#endif // BUILD_WIN32
+
+#define CALL_TO_ALL_ITEMS( expr ) \
+ mItems[LeftItem]->expr; \
+ mItems[CenterItem]->expr; \
+ mItems[RightItem]->expr;
/*!
*
*/
-void ScanningHelper::start()
-{
- QTimer::singleShot( 0, this, SLOT(startSlide()) );
-}
-
-/*!
- * Private slot
- */
-void ScanningHelper::startSlide()
-{
- mCarousel.scrollToIndex( mModelIndex, RadioStationCarousel::NoSignal );
- startNumberScroll();
-}
-
-/*!
- * Private slot
- */
-void ScanningHelper::startNumberScroll()
-{
- //TODO: Take italy case into account
- if ( mPreviousFrequency ) {
- mNumberScrollingTimeLine->setFrameRange( mPreviousFrequency / KFreqScrollDivider, mCurrentFrequency / KFreqScrollDivider );
- mNumberScrollingTimeLine->start();
- } else {
- emit mCarousel.scanAnimationFinished();
- }
-}
-
-/*!
- * Private slot
- */
-void ScanningHelper::numberScrollUpdate( int value )
-{
- if ( mStationItem ) {
- mStationItem->setFrequency( value * KFreqScrollDivider );
- }
-}
-
-// ===============================================================
-// Carousel
-// ===============================================================
-
-/*!
- *
- */
-RadioStationCarousel::RadioStationCarousel( RadioUiEngine* uiEngine ) :
- HbGridView( 0 ),
- mUiEngine( uiEngine ),
- mAntennaAttached( false ),
+RadioStationCarousel::RadioStationCarousel( QGraphicsItem* parent ) :
+ HbScrollArea( parent ),
+ mUiEngine( NULL ),
mAutoScrollTime( 300 ),
mGenericTimer( new QTimer( this ) ),
mTimerMode( NoTimer ),
- mScanningHelper( 0 ),
- mInfoText( 0 ),
- mCurrentItem( 0 ),
- mPanStartPos( 0 )
+ mAnimator( NULL ),
+ mInfoText( NULL ),
+ mContainer( new HbWidget( this ) ),
+ mMidScrollPos( 0 ),
+ mMaxScrollPos( 0 ),
+ mCurrentIndex( 0 ),
+ mTargetIndex( -1 ),
+ mIsCustomFreq( false ),
+ mInfoTextType( CarouselInfoText::None ),
+ mModel( NULL ),
+ mPosAdjustmentDisabled( false ),
+ mScrollDirection( Scroll::Shortest ),
+ mManualSeekMode( false ),
+ mAlternateSkipping( false )
#ifdef USE_DEBUGGING_CONTROLS
,mRdsLabel( new RadioFadingLabel( this ) )
#endif // USE_DEBUGGING_CONTROLS
{
- RadioUiUtilities::setCarousel( this );
- setClampingStyle( HbScrollArea::StrictClamping );
- setScrollingStyle( HbScrollArea::Pan );
}
/*!
@@ -197,49 +141,67 @@
void RadioStationCarousel::init( RadioUiLoader& uiLoader, RadioUiEngine* uiEngine )
{
mUiEngine = uiEngine;
- mAntennaAttached = mUiEngine->isAntennaAttached();
+ RadioUtil::setCarousel( this );
+
+ mItems[LeftItem] = new RadioCarouselItem( *this );
+ mItems[CenterItem] = new RadioCarouselItem( *this );
+ mItems[RightItem] = new RadioCarouselItem( *this );
+
+ QGraphicsLinearLayout* layout = new QGraphicsLinearLayout( Qt::Horizontal );
+ layout->setContentsMargins( 0, 0, 0, 0 );
+ layout->setSpacing( 0 );
+ layout->addItem( mItems[LeftItem] );
+ layout->addItem( mItems[CenterItem] );
+ layout->addItem( mItems[RightItem] );
+ mContainer->setLayout( layout );
+ setContentWidget( mContainer );
+
+ setClampingStyle( HbScrollArea::NoClamping );
+ setScrollDirections( Qt::Horizontal );
+
+ setFrictionEnabled( true );
+ setHorizontalScrollBarPolicy( HbScrollArea::SCROLLBAR_POLICY );
+ setVerticalScrollBarPolicy( HbScrollArea::ScrollBarAlwaysOff );
mInfoText = uiLoader.findWidget<HbLabel>( DOCML::MV_NAME_INFO_TEXT );
mInfoText->setTextWrapping( Hb::TextWordWrap );
- setRowCount( 1 );
- setColumnCount( 1 );
+#ifdef BUILD_WIN32
+ HbFontSpec spec = mInfoText->fontSpec();
+ spec.setRole( HbFontSpec::Secondary );
+ mInfoText->setFontSpec( spec );
+#endif
+
setScrollDirections( Qt::Horizontal );
- setFrictionEnabled( true );
- setLongPressEnabled( false );
- setItemRecycling( false );
- setUniformItemSizes( true );
- setItemPrototype( new RadioStationItem( *this ) );
- setSelectionMode( NoSelection );
-
-// grabGesture( Qt::PanGesture );
+// grabGesture( Qt::SwipeGesture );
- RadioCarouselModel* carouselModel = mUiEngine->carouselModel();
- setCarouselModel( carouselModel );
-
- mCurrentItem = static_cast<RadioStationItem*>( itemByIndex( carouselModel->index( 0, 0 ) ) );
+// Radio::connect( this, SIGNAL(scrollPositionChanged(QPointF)),
+// this, SLOT(scrollPosChanged(QPointF)) );
+ Radio::connect( this, SIGNAL(scrollingEnded()),
+ this, SLOT(adjustAfterScroll()) );
- RadioStationModel* stationModel = &mUiEngine->stationModel();
- connectAndTest( stationModel, SIGNAL(favoriteChanged(RadioStation)),
+ mModel = &mUiEngine->stationModel();
+ Radio::connect( mModel, SIGNAL(favoriteChanged(RadioStation)),
this, SLOT(update(RadioStation)) );
- connectAndTest( stationModel, SIGNAL(stationDataChanged(RadioStation)),
+ Radio::connect( mModel, SIGNAL(stationDataChanged(RadioStation)),
this, SLOT(update(RadioStation)));
- connectAndTest( stationModel, SIGNAL(radioTextReceived(RadioStation)),
+ Radio::connect( mModel, SIGNAL(radioTextReceived(RadioStation)),
this, SLOT(updateRadioText(RadioStation)));
- connectAndTest( stationModel, SIGNAL(dynamicPsChanged(RadioStation)),
+ Radio::connect( mModel, SIGNAL(dynamicPsChanged(RadioStation)),
this, SLOT(update(RadioStation)));
- updateClampingStyle();
-
- connectAndTest( this, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)),
- this, SLOT(openContextMenu(HbAbstractViewItem*,QPointF)) );
- setLongPressEnabled( true );
-
mGenericTimer->setSingleShot( true );
- connectAndTest( mGenericTimer, SIGNAL(timeout()),
+ Radio::connect( mGenericTimer, SIGNAL(timeout()),
this, SLOT(timerFired()));
- initToLastTunedFrequency();
+ Radio::connect( mModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(updateStations()) );
+ Radio::connect( mModel, SIGNAL(modelReset()),
+ this, SLOT(updateStations()) );
+ Radio::connect( mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(updateStations()) );
+
+ setFrequency( mUiEngine->currentFrequency(), TuneReason::Unspecified );
#ifdef USE_DEBUGGING_CONTROLS
mRdsLabel->setPos( QPoint( 300, 10 ) );
@@ -251,7 +213,7 @@
mRdsLabel->setFontSpec( spec );
mRdsLabel->setTextColor( Qt::gray );
if ( mUiEngine ) {
- connectAndTest( mUiEngine, SIGNAL(rdsAvailabilityChanged(bool)),
+ Radio::connect( mUiEngine, SIGNAL(rdsAvailabilityChanged(bool)),
this, SLOT(setRdsAvailable(bool)) );
}
#endif // USE_DEBUGGING_CONTROLS
@@ -260,52 +222,42 @@
/*!
*
*/
-void RadioStationCarousel::setCarouselModel( RadioCarouselModel* carouselModel )
+void RadioStationCarousel::setFrequency( uint frequency, int reason, Scroll::Direction direction )
{
- if ( carouselModel ) {
- connectAndTest( carouselModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(insertFrequency(QModelIndex,int,int)) );
- connectAndTest( carouselModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
- this, SLOT(prepareToRemoveFrequency(QModelIndex,int,int)) );
- connectAndTest( carouselModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(removeFrequency(QModelIndex,int,int)) );
- } else {
- QAbstractItemModel* currentModel = model();
- disconnect( currentModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(insertFrequency(QModelIndex,int,int)) );
- disconnect( currentModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
- this, SLOT(prepareToRemoveFrequency(QModelIndex,int,int)) );
- disconnect( currentModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(removeFrequency(QModelIndex,int,int)) );
- }
- setModel( carouselModel );
- updateFrequencies();
- initCurrentStationItem();
-}
+ if ( mModel ) {
+ if ( !mManualSeekMode ) {
+
+ if ( mModel->rowCount() <= 1 ) {
+ mItems[LeftItem]->setStation( RadioStation() );
+ mItems[RightItem]->setStation( RadioStation() );
+ }
-/*!
- *
- */
-void RadioStationCarousel::setFrequency( uint frequency, int reason )
-{
- RadioStationItem* item = currentStationItem();
-// if ( item && item->mFrequency == frequency ) {
-// return;
-// }
+ mIsCustomFreq = false;
+ if ( reason == TuneReason::Skip || reason == TuneReason::StationScanFinalize ) {
+ const int newIndex = mModel->indexFromFrequency( frequency );
+ scrollToIndex( newIndex, direction, NoSignal );
+ mCurrentIndex = newIndex;
+ } else {
+ if ( mModel->contains( frequency ) ) {
+ mCurrentIndex = mModel->indexFromFrequency( frequency );
+ } else {
+ const RadioStation prevStation = mModel->findClosest( frequency, StationSkip::Previous );
+ if ( prevStation.isValid() ) {
+ mCurrentIndex = mModel->indexFromFrequency( prevStation.frequency() );
+ } else {
+ mCurrentIndex = -1;
+ }
- if ( mModelIndexes.contains( frequency ) ) {
- QModelIndex index = mModelIndexes.value( frequency );
+ mIsCustomFreq = true;
+ }
- if ( reason == TuneReason::FrequencyStrip || reason == TuneReason::StationsList ) {
- scrollToIndex( index, RadioStationCarousel::NoAnim | RadioStationCarousel::NoSignal );
- } else if ( reason == TuneReason::Skip || reason == TuneReason::StationScan ) {
- scrollToIndex( index, RadioStationCarousel::NoSignal );
+ mItems[CenterItem]->setFrequency( frequency );
+ mTimerMode = SetFrequency;
+ mGenericTimer->stop();
+ mGenericTimer->start( SET_FREQUENCY_TIMEOUT );
+ }
} else {
- scrollToIndex( index );
- }
- } else {
- if ( item ) {
- item->setFrequency( frequency );
+ mItems[CenterItem]->setFrequency( frequency );
}
}
}
@@ -323,7 +275,7 @@
*/
bool RadioStationCarousel::isAntennaAttached() const
{
- return mAntennaAttached;
+ return mUiEngine->isAntennaAttached();
}
/*!
@@ -331,19 +283,24 @@
*/
void RadioStationCarousel::setScanningMode( bool scanning )
{
- initCurrentStationItem();
+ CALL_TO_ALL_ITEMS( setSeekLayout( scanning ) );
if ( scanning ) {
-
setInfoText( CarouselInfoText::Scanning );
- if ( !mScanningHelper ) {
- mScanningHelper = new ScanningHelper( *this );
+ if ( !mAnimator ) {
+ mAnimator = new RadioCarouselAnimator( *this );
}
+ mAnimator->startFlashingText();
} else {
- delete mScanningHelper;
- mScanningHelper = 0;
+ if ( mAnimator ) {
+ mAnimator->stopFlashingText();
+ }
clearInfoText();
+ setCenterIndex( 0 );
+ mTimerMode = FavoriteHintShow;
+ mGenericTimer->start( FAVORITE_HINT_SHOW_DELAY );
}
+
setEnabled( !scanning );
}
@@ -352,7 +309,7 @@
*/
bool RadioStationCarousel::isInScanningMode() const
{
- return RadioUiUtilities::isScannerAlive();
+ return RadioUtil::scanStatus() == Scan::ScanningInMainView;
}
/*!
@@ -360,21 +317,7 @@
*/
void RadioStationCarousel::cleanRdsData()
{
- RadioStationItem* item = currentStationItem();
- if ( item ) {
- item->cleanRdsData();
- }
-}
-
-/*!
- *
- */
-void RadioStationCarousel::updateCurrentItem()
-{
- RadioStationItem* item = currentStationItem();
- if ( item ) {
- item->update();
- }
+ mItems[CenterItem]->cleanRdsData();
}
/*!
@@ -382,40 +325,23 @@
*/
void RadioStationCarousel::animateNewStation( const RadioStation& station )
{
- if ( mScanningHelper ) {
- RadioCarouselModel* model = carouselModel();
- const QModelIndex index = model->modelIndexFromFrequency( station.frequency() );
- mScanningHelper->mModelIndex = index;
- mScanningHelper->mCurrentFrequency = station.frequency();
- mScanningHelper->mStationItem = static_cast<RadioStationItem*>( itemByIndex( index ) );
+ if ( mAnimator && mUiEngine ) {
+ const uint previousFrequency = mItems[CenterItem]->frequency();
- uint prevFrequency = 0;
- if ( model->rowCount() > 1 ) {
- const int prevIndex = index.row() - 1;
- RadioStation prevStation = model->data( model->index( prevIndex, 0 ), RadioStationModel::RadioStationRole ).value<RadioStation>();
- prevFrequency = prevStation.frequency();
- } else if ( mUiEngine ) {
- prevFrequency = mUiEngine->minFrequency();
- }
+ mItems[RightItem]->setFrequency( previousFrequency );
+ mCurrentIndex = mModel->indexFromFrequency( station.frequency() );
- mScanningHelper->mPreviousFrequency = prevFrequency;
- if ( mScanningHelper->mStationItem ) {
- mScanningHelper->mStationItem->setFrequency( prevFrequency );
- mScanningHelper->mStationItem->cleanRdsData();
- }
-
- mScanningHelper->start();
+ mAnimator->startNumberScroll( previousFrequency, station.frequency() );
}
}
/*!
*
*/
-void RadioStationCarousel::setItemVisible( bool visible )
+void RadioStationCarousel::cancelAnimation()
{
- RadioStationItem* item = currentStationItem();
- if ( item ) {
- item->setVisible( visible );
+ if ( mAnimator ) {
+ mAnimator->stopAll();
}
}
@@ -425,13 +351,21 @@
void RadioStationCarousel::setInfoText( CarouselInfoText::Type type )
{
mInfoTextType = type;
- if ( type == CarouselInfoText::NoFavorites ) {
- mInfoText->setPlainText( hbTrId( "txt_rad_dialog_long_press_arrow_keys_to_search_str" ) );
+ if ( type == CarouselInfoText::NoFavorites || type == CarouselInfoText::FavoriteIconHint ) {
+// mInfoText->setPlainText( hbTrId( "txt_rad_dialog_long_press_arrow_keys_to_search_str" ) );
+ //TODO: Remove hardcoding. Temporarily hardcoded for usability testing
+ mInfoText->setPlainText( "Tap star to mark favourites" );
mInfoText->setAlignment( Qt::AlignCenter );
- setItemVisible( false );
+ mItems[CenterItem]->setItemVisibility( RadioCarouselItem::IconVisible );
mTimerMode = InfoText;
mGenericTimer->setInterval( INFOTEXT_NOFAVORITES_TIMEOUT );
mGenericTimer->start();
+
+ if ( !mAnimator ) {
+ mAnimator = new RadioCarouselAnimator( *this );
+ }
+ mAnimator->startFlashingIcon();
+
} else if ( type == CarouselInfoText::ConnectAntenna ) {
cleanRdsData();
mInfoText->setPlainText( hbTrId( "txt_rad_info_connect_wired_headset1" ) );
@@ -444,6 +378,9 @@
cleanRdsData();
mInfoText->setAlignment( Qt::AlignBottom | Qt::AlignHCenter );
mInfoText->setPlainText( hbTrId( "txt_rad_list_searching_all_available_stations_ple" ) );
+ } else if ( type == CarouselInfoText::ManualSeek ) {
+ mInfoText->setAlignment( Qt::AlignBottom | Qt::AlignHCenter );
+ mInfoText->setPlainText( "Manual Seek Mode" );
}
mInfoText->setVisible( true );
@@ -455,23 +392,81 @@
void RadioStationCarousel::clearInfoText()
{
if ( mInfoTextType != CarouselInfoText::None ) {
+ if ( mAnimator ) {
+ mAnimator->stopFlashingIcon();
+ }
+
mGenericTimer->stop();
mInfoTextType = CarouselInfoText::None;
mInfoText->setVisible( false );
mInfoText->clear();
- setItemVisible( true );
- updateCurrentItem();
+ mItems[CenterItem]->setItemVisibility( RadioCarouselItem::AllVisible );
+ }
+}
+
+/*!
+ *
+ */
+void RadioStationCarousel::setManualSeekMode( bool manualSeekActive )
+{
+ mManualSeekMode = manualSeekActive;
+ setEnabled( !manualSeekActive );
+
+ mItems[CenterItem]->setSeekLayout( manualSeekActive );
+ if ( manualSeekActive ) {
+ setInfoText( CarouselInfoText::ManualSeek );
+ } else {
+ clearInfoText();
+ setFrequency( mUiEngine->currentFrequency(), TuneReason::Unspecified );
+ }
+}
+
+/*!
+ * TODO: Remove this! This is test code
+ */
+void RadioStationCarousel::setAlternateSkippingMode( bool alternateSkipping )
+{
+ mAlternateSkipping = alternateSkipping;
+}
+
+/*!
+ * Private slot
+ *
+ */
+void RadioStationCarousel::scrollPosChanged( const QPointF& newPosition )
+{
+ Q_UNUSED( newPosition );
+// const int xPos = static_cast<int>( newPosition.x() );
+// mItems[CenterItem]->setPos( xPos - mMidScrollPos, 0 );
+}
+
+/*!
+ * Private slot
+ ''
+ */
+void RadioStationCarousel::adjustAfterScroll()
+{
+ if ( isInScanningMode() ) {
+ return;
+ }
+
+ if ( mTargetIndex != -1 ) {
+ setCenterIndex( mTargetIndex );
}
}
/*!
* Private slot
+ *
*/
void RadioStationCarousel::update( const RadioStation& station )
{
- RadioStationItem* item = currentStationItem();
- if ( item && item->frequency() == station.frequency() && !isInScanningMode() ) {
- item->update( &station );
+ if ( !mManualSeekMode && !isInScanningMode() ) {
+ for ( int i = LeftItem; i <= RightItem; ++i ) {
+ if ( mItems[i]->frequency() == station.frequency() ) {
+ mItems[i]->update( &station );
+ }
+ }
}
}
@@ -482,15 +477,12 @@
{
if ( isAntennaAttached() && !isInScanningMode() ) {
if ( station.radioText().isEmpty() ) {
- RadioStationItem* item = currentStationItem();
- if ( item ) {
- item->mRadiotextLabel->setText( "" );
- }
+ mItems[CenterItem]->setRadioText( "" );
} else {
mRadioTextHolder = station.radioText();
mTimerMode = RtPlusCheck;
mGenericTimer->stop();
- mGenericTimer->setInterval( KRadioTextPlusCheckTimeout );
+ mGenericTimer->setInterval( RTPLUS_CHECK_TIMEOUT );
mGenericTimer->start();
}
}
@@ -499,68 +491,13 @@
/*!
* Private slot
*/
-void RadioStationCarousel::insertFrequency( const QModelIndex& parent, int first, int last )
+void RadioStationCarousel::updateStations()
{
- Q_UNUSED( parent );
- QAbstractItemModel* freqModel = model();
-
- for ( int i = first; freqModel && i <= last; ++i ) {
- QModelIndex index = freqModel->index( i, 0 );
- RadioStation station = freqModel->data( index, RadioStationModel::RadioStationRole ).value<RadioStation>();
- mModelIndexes.insert( station.frequency(), index );
- LOG_FORMAT( "Added frequency %u", station.frequency() );
- if ( !isInScanningMode() ) {
- scrollToIndex( index, RadioStationCarousel::NoAnim | RadioStationCarousel::NoSignal );
- }
+ if ( isInScanningMode() ) {
+ return;
}
- initCurrentStationItem();
-
- updateClampingStyle();
-}
-
-/*!
- * Private slot
- */
-void RadioStationCarousel::prepareToRemoveFrequency( const QModelIndex& parent, int first, int last )
-{
- Q_UNUSED( parent );
- QAbstractItemModel* freqModel = model();
- for ( int i = first; freqModel && i <= last; ++i ) {
- QModelIndex index = freqModel->index( i, 0 );
- RadioStation station = freqModel->data( index, RadioStationModel::RadioStationRole ).value<RadioStation>();
- mModelIndexes.remove( station.frequency() );
- }
-}
-
-/*!
- * Private slot
- */
-void RadioStationCarousel::removeFrequency( const QModelIndex& parent, int first, int last )
-{
- Q_UNUSED( parent );
- Q_UNUSED( first );
- Q_UNUSED( last );
-
- initCurrentStationItem();
- updateClampingStyle();
-}
-
-/*!
- * Private slot
- */
-void RadioStationCarousel::updateFrequencies()
-{
- mModelIndexes.clear();
- QAbstractItemModel* itemModel = model();
- if ( itemModel ) {
- const int count = itemModel->rowCount();
- for ( int i = 0; i < count; ++i ) {
- QModelIndex index = itemModel->index( i, 0 );
- uint frequency = itemModel->data( index, RadioStationModel::RadioStationRole ).value<RadioStation>().frequency();
- mModelIndexes.insert( frequency, index );
- }
- }
+ setFrequency( mUiEngine->currentFrequency(), TuneReason::Unspecified );
}
/*!
@@ -568,29 +505,46 @@
*/
void RadioStationCarousel::timerFired()
{
- if ( mTimerMode == RtPlusCheck ) {
- RadioStationItem* item = currentStationItem();
- if ( item ) {
- item->mRadiotextLabel->setText( mRadioTextHolder );
- }
+ if ( mTimerMode == SetFrequency ) {
+ setCenterIndex( mCurrentIndex, NoSignal | IgnoreCenter );
+ mTimerMode = NoTimer;
+ } else if ( mTimerMode == RtPlusCheck ) {
+ //mItems[CenterItem]->mRadiotextLabel->setText( mRadioTextHolder );
mRadioTextHolder = "";
+ mTimerMode = NoTimer;
} else if ( mTimerMode == InfoText ) {
clearInfoText();
+ mTimerMode = NoTimer;
+ } else if ( mTimerMode == FavoriteHintShow ) {
+ setInfoText( CarouselInfoText::FavoriteIconHint );
+ mTimerMode = FavoriteHintHide;
+ mGenericTimer->start( FAVORITE_HINT_HIDE_DELAY );
+ } else if ( mTimerMode == FavoriteHintHide ) {
+ clearInfoText();
+ mTimerMode = NoTimer;
}
-
- mTimerMode = NoTimer;
}
/*!
* Private slot
*/
-void RadioStationCarousel::openContextMenu( HbAbstractViewItem* item, const QPointF& coords )
+void RadioStationCarousel::toggleFavorite()
{
- if ( item ) {
- static_cast<RadioStationItem*>( item )->handleLongPress( coords );
+ if ( mModel ) {
+ mModel->setData( QModelIndex(), mItems[CenterItem]->frequency(), RadioRole::ToggleFavoriteRole );
}
}
+/*!
+ * Private slot
+ */
+//void RadioStationCarousel::openContextMenu( HbAbstractViewItem* item, const QPointF& coords )
+//{
+// if ( item ) {
+// static_cast<RadioStationItem*>( item )->handleLongPress( coords );
+// }
+//}
+
#ifdef USE_DEBUGGING_CONTROLS
/*!
* Public slot
@@ -614,7 +568,6 @@
*/
void RadioStationCarousel::updateAntennaStatus( bool connected )
{
- mAntennaAttached = connected;
mGenericTimer->stop();
if ( !connected ) {
@@ -629,11 +582,39 @@
*/
void RadioStationCarousel::mousePressEvent( QGraphicsSceneMouseEvent* event )
{
- if ( mInfoTextType == CarouselInfoText::NoFavorites ) {
+ if ( mInfoTextType == CarouselInfoText::NoFavorites || mInfoTextType == CarouselInfoText::FavoriteIconHint ) {
clearInfoText();
}
- HbGridView::mousePressEvent( event );
+ HbScrollArea::mousePressEvent( event );
+}
+
+/*!
+ * \reimp
+ */
+void RadioStationCarousel::resizeEvent( QGraphicsSceneResizeEvent* event )
+{
+ HbScrollArea::resizeEvent( event );
+
+ const int width = (int)event->newSize().width();
+
+ mMidScrollPos = -width;
+ mMaxScrollPos = mMidScrollPos * 2;
+
+ if ( isInitialized() ) {
+ mItems[LeftItem]->setMinimumWidth( width );
+ mItems[CenterItem]->setMinimumWidth( width );
+ mItems[RightItem]->setMinimumWidth( width );
+ }
+}
+
+/*!
+ * \reimp
+ */
+void RadioStationCarousel::showEvent( QShowEvent* event )
+{
+ HbScrollArea::showEvent( event );
+// mContainer->setPos( mMidScrollPos, 0 );
}
/*!
@@ -641,29 +622,23 @@
*/
void RadioStationCarousel::gestureEvent( QGestureEvent* event )
{
- HbGridView::gestureEvent( event );
+// if ( HbSwipeGesture* swipeGesture = static_cast<HbSwipeGesture*>( event->gesture( Qt::SwipeGesture ) ) ) {
+// if ( swipeGesture->state() == Qt::GestureFinished ) {
+// if ( swipeGesture->horizontalDirection() == QSwipeGesture::Left ) {
+// emit skipRequested( StationSkip::Next );
+// } else if ( swipeGesture->horizontalDirection() == QSwipeGesture::Right ) {
+// emit skipRequested( StationSkip::Previous );
+// }
+// mIsCustomFreq = false;
+// }
+// return;
+// }
+
+ HbScrollArea::gestureEvent( event );
if ( HbPanGesture* gesture = qobject_cast<HbPanGesture*>( event->gesture( Qt::PanGesture ) ) ) {
if ( gesture->state() == Qt::GestureFinished ) {
- updatePos( (int)gesture->offset().x() );
- }
- }
-}
-
-/*!
- *
- */
-void RadioStationCarousel::initToLastTunedFrequency()
-{
- const uint currentFrequency = mUiEngine->currentFrequency();
- const QModelIndex currentIndex = carouselModel()->modelIndexFromFrequency( currentFrequency );
-
- if ( currentIndex.isValid() ) {//&& itemByIndex( currentIndex ) ) {
- scrollToIndex( currentIndex, RadioStationCarousel::NoSignal | RadioStationCarousel::NoAnim );
- } else {
- RadioStationItem* item = static_cast<RadioStationItem*>( itemAt( 0, 0 ) );
- if ( item ) {
- item->setFrequency( currentFrequency );
+ adjustPos( (int)gesture->offset().x() );
}
}
}
@@ -671,87 +646,265 @@
/*!
*
*/
-void RadioStationCarousel::updateClampingStyle()
+bool RadioStationCarousel::isInitialized() const
+{
+ return mUiEngine != NULL;
+}
+
+/*!
+ *
+ */
+void RadioStationCarousel::setCenterIndex( int index, ScrollMode mode )
+{
+ Q_UNUSED( mode );
+ if ( mModel ) {
+ const int newIndex = trimIndex( index );
+ mCurrentIndex = newIndex;
+ mTargetIndex = -1;
+
+ if ( !mIsCustomFreq ) {
+ mItems[CenterItem]->setStation( mModel->stationAt( mCurrentIndex ) );
+ }
+
+ if ( mModel->rowCount() > 1 ) {
+ const int leftIndex = prevIndex( mCurrentIndex );
+ const int rightIndex = nextIndex( mCurrentIndex );
+ mItems[LeftItem]->setStation( mModel->stationAt( leftIndex ) );
+ mItems[RightItem]->setStation( mModel->stationAt( rightIndex ) );
+ } else {
+
+ if ( mIsCustomFreq ) {
+ const uint frequency = mItems[CenterItem]->frequency();
+ mItems[LeftItem]->setStation( mModel->findClosest( frequency, StationSkip::Previous ) );
+ mItems[RightItem]->setStation( mModel->findClosest( frequency, StationSkip::Next ) );
+ } else {
+ mItems[LeftItem]->setStation( RadioStation() );
+ mItems[RightItem]->setStation( RadioStation() );
+ }
+ }
+
+ scrollContentsTo( QPointF( -mMidScrollPos /* + delta */, 0 ), 0 );
+
+// if ( !mode.testFlag( NoSignal ) ) {
+// uint frequency = mModel->stationAt( mCurrentIndex ).frequency();
+// emit frequencyChanged( frequency, TuneReason::StationCarousel, mScrollDirection );
+// mScrollDirection = Scroll::Shortest;
+// }
+ }
+}
+
+/*!
+ *
+ */
+void RadioStationCarousel::scrollToIndex( int index, Scroll::Direction direction, ScrollMode mode )
{
- if ( model()->rowCount() > 1 ) {
- setClampingStyle( HbScrollArea::StrictClamping );
- } else {
- setClampingStyle( HbScrollArea::BounceBackClamping );
- update( mUiEngine->stationModel().currentStation() );
+ if ( mModel && index >= 0 ) {
+ mTargetIndex = index;
+ const int difference = calculateDifference( index, direction );
+ int scrollTime = mAutoScrollTime;
+
+ int posX = direction == Scroll::Left ? -mMaxScrollPos : 0;
+ if ( difference == 1 ) {
+ if ( direction == Scroll::Right ) {
+ posX = 0;
+ } else if ( direction == Scroll::Left ) {
+ posX = -mMaxScrollPos;
+ }
+ } else {
+ if ( direction == Scroll::Right ) {
+ // Item where the scrolling starts
+ mItems[RightItem]->setStation( mModel->stationAt( mCurrentIndex ) );
+
+ // Item that is skipped over
+ const uint centerFreq = mModel->stationAt( nextIndex( index ) ).frequency();
+ mItems[CenterItem]->setFrequency( centerFreq );
+
+ // Item where the scrolling ends
+ const RadioStation station = mModel->stationAt( index );
+ mItems[LeftItem]->setStation( station );
+
+ mContainer->setPos( mMaxScrollPos, 0 );
+ posX = 0;
+ } else if ( direction == Scroll::Left ) {
+ // Item where the scrolling starts
+ mItems[LeftItem]->setStation( mModel->stationAt( mCurrentIndex ) );
+
+ // Item that is skipped over
+ const uint centerFreq = mModel->stationAt( prevIndex( index ) ).frequency();
+ mItems[CenterItem]->setFrequency( centerFreq );
+
+ // Item where the scrolling ends
+ const RadioStation station = mModel->stationAt( index );
+ mItems[RightItem]->setStation( station );
+
+ mContainer->setPos( 0, 0 );
+ posX = -mMaxScrollPos;
+ }
+ }
+
+ if ( mode.testFlag( UpdateItem ) ) {
+ //item->update();
+ }
+
+ if ( mode.testFlag( NoAnim ) ) {
+ scrollTime = 0;
+ } else if ( mode.testFlag( FromPanGesture ) ) {
+ if ( mAlternateSkipping ) { //TODO: Remove this! This is test code
+ scrollTime = 500;
+ } else {
+ scrollTime = 300;
+ }
+ } else if ( mode.testFlag( FromSwipeGesture ) ) {
+ scrollTime = 100;
+ }
+
+ scrollContentsTo( QPointF( posX, 0 ), scrollTime );
}
}
/*!
*
*/
-void RadioStationCarousel::initCurrentStationItem()
+int RadioStationCarousel::calculateDifference( int targetIndex, Scroll::Direction& direction )
{
- mCurrentItem = static_cast<RadioStationItem*>( visibleItems().first() );
+ int difference = 0;
+ const int rowCount = mModel->rowCount();
+
+ int diffToLeft = 0;
+ int diffToRight = 0;
+ if ( targetIndex > mCurrentIndex ) {
+ const int loopedDiff = mCurrentIndex + rowCount - targetIndex;
+ const int directDiff = targetIndex - mCurrentIndex;
+ diffToLeft = loopedDiff;
+ diffToRight = directDiff;
+ } else {
+ const int loopedDiff = targetIndex + rowCount - mCurrentIndex;
+ const int directDiff = mIsCustomFreq ? 1 : mCurrentIndex - targetIndex;
+ diffToLeft = directDiff;
+ diffToRight = loopedDiff;
+ }
+
+ if ( direction == Scroll::Right ) {
+ difference = diffToLeft;
+ } else if ( direction == Scroll::Left ) {
+ difference = diffToRight;
+ } else {
+ if ( diffToLeft < diffToRight ) {
+ difference = diffToLeft;
+ direction = Scroll::Right;
+ } else {
+ difference = diffToRight;
+ direction = Scroll::Left;
+ }
+ }
+
+ return difference;
}
/*!
*
*/
-RadioStationItem* RadioStationCarousel::currentStationItem()
+bool RadioStationCarousel::isScrollingAllowed() const
{
- return mCurrentItem;
+ const int rowCount = mModel->rowCount();
+ return rowCount > 1 || ( rowCount == 1 && mIsCustomFreq );
}
/*!
*
*/
-RadioCarouselModel* RadioStationCarousel::carouselModel() const
+void RadioStationCarousel::adjustPos( int offset )
{
- return static_cast<RadioCarouselModel*>( model() );
-}
+ int newPos = mMidScrollPos;
+ const int threshold = (int)size().width() / 5;
+ int newIndex = mCurrentIndex;
+ bool needsToScroll = false;
-/*!
- *
- */
-void RadioStationCarousel::scrollToIndex( const QModelIndex& index, RadioStationCarousel::ScrollMode mode )
-{
- RadioStationItem* item = static_cast<RadioStationItem*>( itemByIndex( index ) );
- if ( index.isValid() && item ) {
- const int posX = index.row() * (int)size().width();
- setCurrentIndex( index, QItemSelectionModel::ClearAndSelect );
+ if ( isScrollingAllowed() && abs( offset ) >= threshold ) {
+ needsToScroll = true;
+ if ( offset > 0 ) {
+ newPos = 0;
+ mScrollDirection = Scroll::Right;
+ if ( !mIsCustomFreq ) {
+
+ if ( mAlternateSkipping ) { //TODO: Remove this! This is test code
+ const uint newFreq = mModel->findClosest( mItems[CenterItem]->frequency(), StationSkip::PreviousFavorite ).frequency();
+ if ( newFreq > 0 ) {
+ newIndex = mModel->indexFromFrequency( newFreq );
+ } else {
+ needsToScroll = false;
+ newPos = mMidScrollPos;
+ } // End test code
- if ( mode.testFlag( UpdateItem ) ) {
- item->update();
- }
+ } else {
+ --newIndex;
+ }
+ }
+ } else {
+ mScrollDirection = Scroll::Left;
+ newPos = mMaxScrollPos;
- int scrollTime = mAutoScrollTime;
- if ( mode.testFlag( NoAnim ) ) {
- scrollTime = 0;
+ if ( mAlternateSkipping ) { //TODO: Remove this! This is test code
+ const uint newFreq = mModel->findClosest( mItems[CenterItem]->frequency(), StationSkip::NextFavorite ).frequency();
+ if ( newFreq > 0 ) {
+ newIndex = mModel->indexFromFrequency( newFreq );
+ } else {
+ needsToScroll = false;
+ newPos = mMidScrollPos;
+ } // End test code
+
+ } else {
+ ++newIndex;
+ }
}
- scrollContentsTo( QPointF( posX, 0 ), scrollTime );
- mCurrentItem = static_cast<RadioStationItem*>( item );
- if ( !mode.testFlag( NoSignal ) ) {
- uint frequency = model()->data( index, RadioStationModel::RadioStationRole ).value<RadioStation>().frequency();
- emit frequencyChanged( frequency, TuneReason::StationCarousel );
- }
+ }
+
+ newIndex = trimIndex( newIndex );
+ if ( needsToScroll ) {
+ const uint frequency = mModel->stationAt( newIndex ).frequency();
+ emit frequencyChanged( frequency, TuneReason::StationCarousel, mScrollDirection );
+ scrollToIndex( newIndex, mScrollDirection, RadioStationCarousel::FromPanGesture );
+ mIsCustomFreq = false;
+ } else {
+ scrollContentsTo( QPointF( -newPos, 0 ), 300 );
}
}
/*!
*
*/
-void RadioStationCarousel::updatePos( int offset )
+int RadioStationCarousel::trimIndex( int index )
{
-// QModelIndex index = currentIndex();
-//
-// ScrollMode mode = 0;
-// const qreal threshold = size().width() / 3;
-// if ( abs( offset ) >= threshold ) {
-// if ( offset > 0 ) {
-// index = previousIndex( index );
-// } else {
-// index = nextIndex( index );
-// }
-// } else {
-// mode |= RadioStationCarousel::NoSignal;
-// }
-//
-// scrollToIndex( index, mode );
+ const int count = mModel ? mModel->rowCount() : 0;
+
+ if ( count == 0 ) {
+ return -1;
+ }
+
+ if ( index < 0 ) {
+ index = count - 1;
+ }
+ index %= count;
+ return index;
+}
+
+/*!
+ *
+ */
+int RadioStationCarousel::prevIndex( int index )
+{
+ if ( !mIsCustomFreq ) {
+ --index;
+ }
+ return trimIndex( index );
+}
+
+/*!
+ *
+ */
+int RadioStationCarousel::nextIndex( int index )
+{
+ return trimIndex( index + 1 );
}
/*!
@@ -759,11 +912,10 @@
*/
void RadioStationCarousel::skip( StationSkip::Mode mode )
{
- RadioStationItem* item = currentStationItem();
- if ( item ) {
- RadioCarouselModel* model = carouselModel();
- const uint frequency = model->findClosest( item->frequency(), mode ).frequency();
- const QModelIndex& index = model->modelIndexFromFrequency( frequency );
- scrollToIndex( index, RadioStationCarousel::NoSignal );
+ if ( mModel ) {
+ const uint frequency = mModel->findClosest( mItems[CenterItem]->frequency(), mode ).frequency();
+ const int index = mModel->indexFromFrequency( frequency );
+ const Scroll::Direction direction = RadioUtil::scrollDirectionFromSkipMode( mode );
+ scrollToIndex( index, direction, RadioStationCarousel::NoSignal );
}
}
--- a/radioapp/radiowidgets/src/radiostationitem.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +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 <HbStyleLoader>
-#include <HbPushButton>
-#include <HbAnchorLayout>
-#include <HbMessageBox>
-
-// User includes
-#include "radiostationitem.h"
-#include "radiostationcarousel.h"
-#include "radiouiengine.h"
-#include "radiofadinglabel.h"
-#include "radiostationmodel.h"
-#include "radiologger.h"
-
-//static const char* FILE_PATH_WIDGETML = ":/layout/radiostationitem.widgetml";
-//static const char* FILE_PATH_CSS = ":/layout/radiostationitem.css";
-static const char* GENRE_LABEL = "tv:genre_label";
-static const char* NAME_LABEL = "tv:name_label";
-static const char* RADIOTEXT_LABEL = "tv:radiotext_label";
-static const char* URL_LABEL = "tv:url_label";
-//static const char* FAVORITE_BUTTON = "favorite_button";
-
-const char* SEEKING_TEXT = "txt_rad_list_tuning";
-const char* CONNECT_HEADSET_TEXT = "txt_rad_list_connect_wireless_antenna_headset_with";
-
-/*!
- *
- */
-RadioStationItem::RadioStationItem( RadioStationCarousel& carousel ) :
- HbAbstractViewItem( &carousel ),
- mCarousel( carousel ),
- mLayout( 0 ),
- mNameLabel( 0 ),
- mIconButton( 0 ),
- mGenreLabel( 0 ),
- mRadiotextLabel( 0 ),
- mUrlLabel( 0 )
-{
- setFlag( QGraphicsItem::ItemIsFocusable, true );
-}
-
-/*!
- * From HbAbstractViewItem
- *
- */
-HbAbstractViewItem* RadioStationItem::createItem()
-{
- RadioStationItem* item = new RadioStationItem( *this ); // Calls copy constructor
-// item->setParent( &mCarousel );
-// item->setParentItem( &mCarousel );
-// item->setItemView( itemView() );
-// item->updateChildItems();
- return item;
-}
-
-/*!
- * From HbAbstractViewItem
- */
-void RadioStationItem::updateChildItems()
-{
- if ( !mLayout )
- {
- mIconButton = new HbPushButton( this );
- QPixmap background( QSize( 50, 50 ) );
- background.fill( Qt::transparent );
- mIconButton->setBackground( HbIcon( background ) );
- mIconButton->setIcon( mCarousel.nonFavoriteIcon() );
- mIconButton->setMaximumSize( 50, 50 );
- connectAndTest( mIconButton, SIGNAL(clicked()), this, SLOT(toggleFavorite()));
-
- mNameLabel = new RadioFadingLabel( this );
- mNameLabel->setAlignment( Qt::AlignCenter );
- mNameLabel->setObjectName( NAME_LABEL );
- HbFontSpec spec = mNameLabel->fontSpec();
- spec.setRole( HbFontSpec::Primary );
- mNameLabel->setFontSpec( spec );
-
- spec.setRole( HbFontSpec::Secondary );
-
- mGenreLabel = new RadioFadingLabel( this );
- mGenreLabel->setAlignment( Qt::AlignCenter );
- mGenreLabel->setObjectName( GENRE_LABEL );
- mGenreLabel->setTextColor( Qt::white );
-
- mRadiotextLabel = new RadioFadingLabel( this );
- mRadiotextLabel->setAlignment( Qt::AlignCenter );
- mRadiotextLabel->setObjectName( RADIOTEXT_LABEL );
- mRadiotextLabel->setTextWrapping( Hb::TextWordWrap );
-// mRadiotextLabel->setFadingEnabled( true ); TODO
-// mRadiotextLabel->setFontSpec( spec );
- mRadiotextLabel->setTextColor( Qt::white );
-
- mUrlLabel = new RadioFadingLabel( this );
- mUrlLabel->setAlignment( Qt::AlignCenter );
- mUrlLabel->setObjectName( URL_LABEL );
- mUrlLabel->setTextColor( Qt::white );
-
- mLayout = new HbAnchorLayout();
-
- mLayout->setAnchor( mLayout, Hb::TopEdge, mIconButton, Hb::TopEdge, 20.0 );
- mLayout->setAnchor( mLayout, Hb::LeftEdge, mIconButton, Hb::LeftEdge, 20.0 );
-
- mLayout->setAnchor( mIconButton, Hb::CenterVEdge, mGenreLabel, Hb::CenterVEdge, 0.0 );
- mLayout->setAnchor( mIconButton, Hb::RightEdge, mGenreLabel, Hb::LeftEdge, 20.0 );
- mLayout->setAnchor( mLayout, Hb::RightEdge, mGenreLabel, Hb::RightEdge, -70.0 );
-
- mLayout->setAnchor( mGenreLabel, Hb::BottomEdge, mNameLabel, Hb::TopEdge, 0.0 );
- mLayout->setAnchor( mLayout, Hb::LeftEdge, mNameLabel, Hb::LeftEdge, 10.0 );
- mLayout->setAnchor( mLayout, Hb::RightEdge, mNameLabel, Hb::RightEdge, -10.0 );
-
- mLayout->setAnchor( mNameLabel, Hb::BottomEdge, mRadiotextLabel, Hb::TopEdge, 10.0 );
- mLayout->setAnchor( mLayout, Hb::LeftEdge, mRadiotextLabel, Hb::LeftEdge, 10.0 );
- mLayout->setAnchor( mLayout, Hb::RightEdge, mRadiotextLabel, Hb::RightEdge, -10.0 );
-
- mLayout->setAnchor( mRadiotextLabel, Hb::BottomEdge, mUrlLabel, Hb::TopEdge, 10.0 );
- mLayout->setAnchor( mLayout, Hb::LeftEdge, mUrlLabel, Hb::LeftEdge, 10.0 );
- mLayout->setAnchor( mLayout, Hb::RightEdge, mUrlLabel, Hb::RightEdge, -10.0 );
- mLayout->setAnchor( mLayout, Hb::BottomEdge, mUrlLabel, Hb::BottomEdge, -10.0 );
-
- setLayout( mLayout );
- }
-
- update();
-}
-
-/*!
- * Private slot
- *
- */
-void RadioStationItem::toggleFavorite()
-{
- RadioUiEngine* uiEngine = carousel()->uiEngine();
- if ( uiEngine ) {
- uiEngine->stationModel().setData( modelIndex(), mFrequency, RadioStationModel::ToggleFavoriteRole );
- }
-}
-
-/*!
- *
- */
-uint RadioStationItem::frequency() const
-{
- return mFrequency;
-}
-
-/*!
- *
- */
-void RadioStationItem::update( const RadioStation* station )
-{
- QModelIndex index = modelIndex();
- if ( !( station && station->isValid() ) && !index.isValid() ) {
- return;
- }
-
- RadioUiEngine* uiEngine = carousel()->uiEngine();
- if ( !mCarousel.isInScanningMode() && uiEngine ) {
- RadioStation tempStation = ( station && station->isValid() ) ? *station
- : index.data( RadioStationModel::RadioStationRole ).value<RadioStation>();
-
- mNameLabel->setTextWithoutFading( nameOrFrequency( tempStation ) );
-
- mGenreLabel->setText( uiEngine->genreToString( tempStation.genre(), GenreTarget::Carousel ) );
-
- if ( !tempStation.radioText().isEmpty() ) {
- mRadiotextLabel->setText( tempStation.radioText() );
- } else if ( !tempStation.dynamicPsText().isEmpty() ) {
- mRadiotextLabel->setText( tempStation.dynamicPsText() );
- } else {
- mRadiotextLabel->setText( "" );
- }
-
- mUrlLabel->setText( tempStation.url() );
-
- mFrequency = tempStation.frequency();
-
- updateFavoriteIcon( tempStation.isFavorite() );
- }
-}
-
-/*!
- *
- */
-void RadioStationItem::setFrequency( uint frequency )
-{
- LOG_FORMAT( "RadioStationItem::setFrequency: %d", frequency );
-
- mNameLabel->setTextWithoutFading( parseFrequency( frequency ) );
- mGenreLabel->setTextWithoutFading( "" );
- mRadiotextLabel->setTextWithoutFading( "" );
- mUrlLabel->setTextWithoutFading( "" );
- mFrequency = frequency;
- updateFavoriteIcon( false );
-}
-
-/*!
- *
- */
-void RadioStationItem::cleanRdsData()
-{
- mNameLabel->setTextWithoutFading( "" );
- mGenreLabel->setTextWithoutFading( "" );
- mRadiotextLabel->setTextWithoutFading( "" );
- mUrlLabel->setTextWithoutFading( "" );
-}
-
-/*!
- *
- */
-void RadioStationItem::handleLongPress( const QPointF& /*coords*/ )
-{
- QString text = QString( "Selected frequency: %1" ).arg( mFrequency );
-// HbMessageBox::information( text );
-}
-
-/*!
- *
- */
-void RadioStationItem::updateFavoriteIcon( bool isFavorite )
-{
- if ( !mCarousel.isInScanningMode() ) {
- if ( isFavorite ) {
- mIconButton->setIcon( mCarousel.favoriteIcon() );
- } else {
- mIconButton->setIcon( mCarousel.nonFavoriteIcon() );
- }
- } else {
- mIconButton->setIcon( HbIcon( "" ) );
- }
-}
-
-/*!
- *
- */
-RadioStationCarousel* RadioStationItem::carousel()
-{
- return static_cast<RadioStationCarousel*>( itemView() );
-}
-
-/*!
- *
- */
-QString RadioStationItem::parseFrequency( const uint frequency )
-{
- //TODO: Frequency localization temporarily disabled
- QString loc = "%L1 Mhz";// "txt_rad_list_l1_mhz_big" );
- return loc.arg( RadioStation::parseFrequency( frequency ) );
-}
-
-/*!
- *
- */
-QString RadioStationItem::nameOrFrequency( const RadioStation& station, uint frequency )
-{
- if ( frequency == 0 ) {
- frequency = station.frequency();
- }
-
- QString text = "";
- if ( station.isValid() && !station.name().isEmpty() ) {
- text = station.name();
- } else {
- text = parseFrequency( frequency );
- }
-
- return text;
-}
--- a/radioapp/radiowidgets/src/radiostationsview.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiostationsview.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -23,18 +23,21 @@
#include <HbAction>
#include <HbInputDialog>
#include <HbMenu>
+#include <QSortFilterProxyModel>
// User includes
#include "radiostationsview.h"
#include "radiologger.h"
#include "radiowindow.h"
#include "radiouiengine.h"
-#include "radiobannerlabel.h"
#include "radiofrequencyscanner.h"
#include "radiouiloader.h"
#include "radiostationmodel.h"
#include "radiostation.h"
-#include "radiostationfiltermodel.h"
+
+// Constants
+const char* REGEX_SHOW_FAVORITES = "true";
+const char* REGEX_SHOW_ALL = ".+";
/*!
*
@@ -42,11 +45,9 @@
RadioStationsView::RadioStationsView() :
RadioViewBase( false ),
mModel( 0 ),
- mFilterModel( 0 ),
mScanStationsAction( 0 ),
mClearListAction( 0 ),
mStationsList( 0 ),
- mHeadingBanner( 0 ),
mFavoritesButton( 0 ),
mLocalStationsButton( 0 ),
mSelectedStation( new RadioStation ),
@@ -97,25 +98,25 @@
* Private slot
*
*/
-void RadioStationsView::listItemClicked( const QModelIndex& index )
+void RadioStationsView::handleClick( const QModelIndex& index )
{
LOG_TIMESTAMP( "Channel change started" );
QModelIndex sourceIndex = mFilterModel->mapToSource( index );
*mSelectedStation = mModel->stationAt( sourceIndex.row() );
- mMainWindow->uiEngine().tuneFrequency( mSelectedStation->frequency(), TuneReason::StationsList );
+ mUiEngine->setFrequency( mSelectedStation->frequency(), TuneReason::StationsList );
}
/*!
* Private slot
*
*/
-void RadioStationsView::listItemLongPressed( HbAbstractViewItem* item, const QPointF& coords )
+void RadioStationsView::handleLongPress( HbAbstractViewItem* item, const QPointF& coords )
{
Q_UNUSED( item );
HbMenu* menu = mUiLoader->findObject<HbMenu>( DOCML::NAME_CONTEXT_MENU );
- *mSelectedStation = mFilterModel->data( item->modelIndex(), RadioStationModel::RadioStationRole ).value<RadioStation>();
+ *mSelectedStation = mFilterModel->data( item->modelIndex(), RadioRole::RadioStationRole ).value<RadioStation>();
HbAction* favoriteAction = mUiLoader->findObject<HbAction>( DOCML::NAME_CONTEXT_FAVORITE );
if ( mSelectedStation->isFavorite() ) {
@@ -135,35 +136,27 @@
void RadioStationsView::updateAntennaStatus( bool connected )
{
Q_UNUSED( connected );
- updateControlVisibilities();
+ updateVisibilities();
}
/*!
* Private slot
*
*/
-void RadioStationsView::updateCurrentStation()
+void RadioStationsView::updateViewMode()
{
- mFilterModel->invalidate();
-}
+ QString section = DOCML::SV_SECTION_SHOW_ALL_STATIONS;
+ QString filter = REGEX_SHOW_ALL;
-/*!
- * Private slot
- *
- */
-void RadioStationsView::deckButtonPressed()
-{
- const bool showFavorites = mFavoritesButton->isChecked();
- if ( showFavorites ) {
- loadSection( DOCML::FILE_STATIONSVIEW, DOCML::SV_SECTION_SHOW_FAVORITES );
- } else {
- loadSection( DOCML::FILE_STATIONSVIEW, DOCML::SV_SECTION_SHOW_ALL_STATIONS );
+ if ( sender() == mFavoritesButton ) {
+ section = DOCML::SV_SECTION_SHOW_FAVORITES;
+ filter = REGEX_SHOW_FAVORITES;
}
- mFilterModel->setTypeFilter( showFavorites ? RadioStation::Favorite
- : RadioStation::LocalStation );
+ loadSection( DOCML::FILE_STATIONSVIEW, section );
+ mFilterModel->setFilterRegExp( filter );
- updateControlVisibilities();
+ updateVisibilities();
}
/*!
@@ -172,7 +165,7 @@
*/
void RadioStationsView::startScanning()
{
- const int rowCount = mMainWindow->uiEngine().stationModel().rowCount();
+ const int rowCount = mUiEngine->stationModel().rowCount();
mCurrentQuestion = StartScanning;
if ( rowCount > 0 ) {
askQuestion( hbTrId( "txt_rad_info_all_stations_in_stations_list_will_be" ) );
@@ -187,7 +180,7 @@
*/
void RadioStationsView::finishScanning()
{
- updateControlVisibilities();
+ updateVisibilities();
mFrequencyScanner.take();
}
@@ -195,7 +188,7 @@
* Private slot
*
*/
-void RadioStationsView::updateControlVisibilities()
+void RadioStationsView::updateVisibilities()
{
LOG_SLOT_CALLER;
bool listEmpty = mModel->rowCount() == 0;
@@ -205,10 +198,10 @@
listEmpty = mModel->favoriteCount() == 0;
}
- mClearListAction->setVisible( !listEmpty );
+ mClearListAction->setEnabled( !listEmpty );
- const bool scanAvailable = mMainWindow->uiEngine().isAntennaAttached() && localStationsMode;
- mScanStationsAction->setVisible( scanAvailable );
+ const bool scanAvailable = mUiEngine->isAntennaAttached() && localStationsMode;
+ mScanStationsAction->setEnabled( scanAvailable );
HbPushButton* scanButton = mUiLoader->findWidget<HbPushButton>( DOCML::SV_NAME_SCAN_BUTTON );
scanButton->setEnabled( scanAvailable );
@@ -235,12 +228,12 @@
{
HbInputDialog* nameQuery = new HbInputDialog();
nameQuery->setAttribute( Qt::WA_DeleteOnClose, true );
- nameQuery->setDismissPolicy( HbDialog::NoDismiss );
+ nameQuery->setDismissPolicy( HbDialog::TapOutside );
nameQuery->setPromptText( hbTrId( "txt_rad_dialog_new_name" ) );
nameQuery->setInputMode( HbInputDialog::TextInput );
nameQuery->setValue( mSelectedStation->name() );
nameQuery->setObjectName( DOCML::NAME_INPUT_QUERY );
- nameQuery->open( this, SLOT(renameDone(HbAction* )) );
+ nameQuery->open( this, SLOT(renameDone(HbAction*)) );
}
/*!
@@ -270,7 +263,7 @@
{
HbInputDialog* dlg = static_cast<HbInputDialog*>( sender() );
- if( action == dlg->primaryAction() ) {
+ if( action ) {
mModel->renameStation( mSelectedStation->presetIndex(), dlg->value().toString() );
}
}
@@ -282,13 +275,12 @@
void RadioStationsView::init()
{
LOG_METHOD;
- mInitialized = true;
- mModel = &mMainWindow->uiEngine().stationModel();
+ mModel = &mUiEngine->stationModel();
- RadioUiEngine* engine = &mMainWindow->uiEngine();
-
- mFilterModel = engine->createNewFilterModel( this );
- mFilterModel->setTypeFilter( RadioStation::LocalStation );
+ mFilterModel = new QSortFilterProxyModel( this );
+ mFilterModel->setDynamicSortFilter( true );
+ mFilterModel->setFilterRole( RadioRole::IsFavoriteRole );
+ mFilterModel->setSourceModel( &mUiEngine->stationModel() );
loadSection( DOCML::FILE_STATIONSVIEW, DOCML::SV_SECTION_SHOW_ALL_STATIONS );
@@ -298,40 +290,55 @@
mModel->setDetail( RadioStationModel::ShowIcons | RadioStationModel::ShowGenre );
mStationsList = mUiLoader->findObject<HbListView>( DOCML::SV_NAME_STATIONS_LIST );
- mHeadingBanner = mUiLoader->findWidget<RadioBannerLabel>( DOCML::SV_NAME_HEADING_BANNER );
mFavoritesButton = mUiLoader->findObject<HbAction>( DOCML::SV_NAME_FAVORITES_BUTTON );
mLocalStationsButton = mUiLoader->findObject<HbAction>( DOCML::SV_NAME_LOCALS_BUTTON );
- connectAndTest( engine, SIGNAL(antennaStatusChanged(bool)),
+ Radio::connect( mUiEngine.data(), SIGNAL(antennaStatusChanged(bool)),
this, SLOT(updateAntennaStatus(bool)) );
- connectAndTest( mModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(updateControlVisibilities() ) );
- connectAndTest( mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(updateControlVisibilities()) );
- connectAndTest( mModel, SIGNAL(modelReset() ),
- this, SLOT(updateControlVisibilities() ) );
- connectAndTest( mFavoritesButton, SIGNAL(triggered() ),
- this, SLOT(deckButtonPressed() ) );
- connectAndTest( mLocalStationsButton, SIGNAL(triggered() ),
- this, SLOT(deckButtonPressed() ) );
+ Radio::connect( mModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(updateVisibilities()) );
+ Radio::connect( mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(updateVisibilities()) );
+ Radio::connect( mModel, SIGNAL(modelReset()),
+ this, SLOT(updateVisibilities()) );
+ Radio::connect( mFavoritesButton, SIGNAL(triggered()),
+ this, SLOT(updateViewMode()) );
+ Radio::connect( mLocalStationsButton, SIGNAL(triggered() ),
+ this, SLOT(updateViewMode()) );
+ Radio::connect( mStationsList, SIGNAL(activated(QModelIndex)),
+ this, SLOT(handleClick(QModelIndex)) );
+ Radio::connect( mStationsList, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)),
+ this, SLOT(handleLongPress(HbAbstractViewItem*,QPointF)) );
- connectAndTest( engine, SIGNAL(tunedToFrequency(uint,int)), this, SLOT(updateCurrentStation()) );
+ connectCommonMenuItem( MenuItem::Exit );
+ connectXmlElement( DOCML::SV_NAME_SCAN_BUTTON, SIGNAL(clicked()),
+ this, SLOT(startScanning()) );
+
+ // Context menu actions
+ connectXmlElement( DOCML::SV_NAME_RENAME_ACTION, SIGNAL(triggered()),
+ this, SLOT(rename()) );
+ connectXmlElement( DOCML::SV_NAME_FAVORITE_ACTION, SIGNAL(triggered()),
+ this, SLOT(toggleFavorite()) );
+ connectXmlElement( DOCML::SV_NAME_DELETE_ACTION, SIGNAL(triggered()),
+ this, SLOT(deleteStation()) );
// "Scan local stations" menu item
mScanStationsAction = mUiLoader->findObject<HbAction>( DOCML::SV_NAME_SCAN_ACTION );
-
+ Radio::connect( mScanStationsAction, SIGNAL(triggered() ),
+ this, SLOT(startScanning() ) );
+
// "Remove all presets" menu item
mClearListAction = mUiLoader->findObject<HbAction>( DOCML::SV_NAME_CLEAR_LIST_ACTION );
- connectAndTest( mClearListAction, SIGNAL(triggered() ),
+ Radio::connect( mClearListAction, SIGNAL(triggered() ),
this, SLOT(clearList() ) );
connectCommonMenuItem( MenuItem::UseLoudspeaker );
initListView();
-
+
initBackAction();
- updateControlVisibilities();
+ updateViewMode();
}
/*!
@@ -340,16 +347,16 @@
void RadioStationsView::userAccepted()
{
if ( mCurrentQuestion == StartScanning ) {
- mFrequencyScanner.reset( new RadioFrequencyScanner( mMainWindow->uiEngine(), this ) );
+ mFrequencyScanner.reset( new RadioFrequencyScanner( *mUiEngine, this ) );
- connectAndTest( mFrequencyScanner.data(), SIGNAL(frequencyScannerFinished()),
+ Radio::connect( mFrequencyScanner.data(), SIGNAL(frequencyScannerFinished()),
this, SLOT(finishScanning()) );
mFrequencyScanner->startScanning();
} else if ( mCurrentQuestion == ClearList ){
const bool favoriteMode = mFavoritesButton->isChecked();
mModel->removeAll( favoriteMode ? RadioStationModel::RemoveFavorites : RadioStationModel::RemoveAll );
- updateControlVisibilities();
+ updateVisibilities();
} else if ( mCurrentQuestion == DeleteStation ) {
mModel->removeStation( mModel->currentStation() );
}
@@ -358,14 +365,6 @@
}
/*!
- * \reimp
- */
-void RadioStationsView::showEvent( QShowEvent* event )
-{
- RadioViewBase::showEvent( event );
-}
-
-/*!
*
*/
void RadioStationsView::initListView()
--- a/radioapp/radiowidgets/src/radiostripbase.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiostripbase.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -34,7 +34,7 @@
mModel( 0 ),
mIsCyclic( true ),
mAutoCenter( false ),
- mSpacing( 0 ),
+ mOverlap( 0 ),
mItemPoolParent( new QGraphicsWidget( NULL ) ),
mCurrentIndex( 0 ),
mPressedIndex( 0 ),
@@ -54,7 +54,7 @@
// so the visibility of the items doesn't need to be modified.
mItemPoolParent->setVisible( false );
- connectAndTest( this, SIGNAL(scrollPositionChanged(QPointF)),
+ Radio::connect( this, SIGNAL(scrollPositionChanged(QPointF)),
this, SLOT(scrollPositionChanged(QPointF)));
}
@@ -124,19 +124,9 @@
/*!
*
*/
-void RadioStripBase::setSpacing( qreal spacing )
+void RadioStripBase::setOverlap( qreal overlap )
{
- if ( mSpacing != spacing )
- {
- mSpacing = spacing;
-
- prepareGeometryChange();
-
- populateAndLayout();
-
- update();
- updateGeometry();
- }
+ mOverlap = overlap;
}
/*!
@@ -266,17 +256,16 @@
mStripLength = boundingRect().width();
qreal itemSize = mItemSize.width();
- mContentsLength = mModel->rowCount() * (itemSize + mSpacing) + mSpacing;
+ mContentsLength = mModel->rowCount() * (itemSize - mOverlap);
if ( mIsCyclic )
{
// if treating the items cyclically, double the content area so it can
// be shifted back and forth as you scroll
- mContentsLength = mModel->rowCount() * (itemSize + mSpacing);
- mContentsLength *= 2.0;
+ mContentsLength *= 2;
}
- qreal currPos = mSpacing;
+ qreal currPos = -mOverlap;
for ( int i = 0; i < mModel->rowCount(); ++i ) {
if ( currPos > mStripLength )
{
@@ -286,13 +275,13 @@
QGraphicsItem* item = constructItem( i, true );
if ( item )
{
- item->setPos( QPointF( currPos, mSpacing ) );
- currPos += itemSize + mSpacing;
+ item->setPos( QPointF( currPos, 0 ) );
+ currPos += itemSize - mOverlap;
}
}
QRectF contentsRect(0,0,0,0);
- contentsRect.setBottom( itemSize + 2 * mSpacing );
+ contentsRect.setBottom( mItemSize.height() );
contentsRect.setRight( mContentsLength );
mStripContainer->setGeometry( contentsRect );
@@ -373,7 +362,7 @@
*/
qreal RadioStripBase::indexToOffset( int index )
{
- return index * ( mItemSize.width() + mSpacing ) + mSpacing;
+ return index * ( mItemSize.width() - mOverlap ) - mOverlap;
}
/*!
@@ -382,7 +371,7 @@
int RadioStripBase::offsetToIndex( qreal offset )
{
const int rows = mModel->rowCount();
- int index = (int)( ( offset - mSpacing) / ( mItemSize.width() + mSpacing ) );
+ int index = (int)( offset / ( mItemSize.width() - mOverlap ) );
if ( mIsCyclic )
{
@@ -479,7 +468,7 @@
QGraphicsItem* item = constructItem( i, true );
if ( item )
{
- item->setPos( QPointF( indexToOffset( i ), mSpacing ) );
+ item->setPos( QPointF( indexToOffset( i ), 0 ) );
}
}
}
@@ -492,7 +481,7 @@
QGraphicsItem* item = constructItem( i, false );
if ( item )
{
- item->setPos( QPointF( indexToOffset( i ), mSpacing ) );
+ item->setPos( QPointF( indexToOffset( i ), 0 ) );
}
}
@@ -503,7 +492,7 @@
QGraphicsItem* item = constructItem( i, true );
if ( item )
{
- item->setPos( QPointF( indexToOffset( i ), mSpacing ) );
+ item->setPos( QPointF( indexToOffset( i ), 0 ) );
}
}
}
--- a/radioapp/radiowidgets/src/radiouiutilities.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +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 <HbEffect>
-
-// User includes
-#include "radiouiutilities.h"
-#include "radiofrequencystrip.h"
-#include "radiostationcarousel.h"
-#include "radiofrequencyscanner.h"
-#include "radiologger.h"
-
-// Constants
-
-static RadioUiUtilities* theInstance = 0;
-
-/*!
- *
- */
-RadioUiUtilities::RadioUiUtilities()
-{
-}
-
-/*!
- *
- */
-RadioUiUtilities::~RadioUiUtilities()
-{
-}
-
-/*!
- *
- */
-bool RadioUiUtilities::addEffects( QEffectList list )
-{
- bool allAvailable = true;
- QEffectList added;
- foreach ( EffectInfo info, list ) {
-#ifdef USE_LAYOUT_FROM_E_DRIVE
- info.mPath.replace( QString( ":/" ), QString( "e:/radiotest/" ) );
-#endif
- if ( HbEffect::add( info.mItem, info.mPath, info.mEvent ) ) {
- added.append( info );
- } else {
- allAvailable = false;
- break;
- }
- }
-
- if ( !allAvailable ) {
- foreach ( const EffectInfo& info, added ) {
- HbEffect::remove( info.mItem, info.mPath, info.mEvent );
- }
- }
-
- return allAvailable;
-}
-
-
-/*!
- *
- */
-RadioFrequencyStrip* RadioUiUtilities::frequencyStrip()
-{
- return instance().mFrequencyStrip;
-}
-
-/*!
- *
- */
-RadioStationCarousel* RadioUiUtilities::carousel()
-{
- return instance().mCarousel;
-}
-
-/*!
- *
- */
-bool RadioUiUtilities::isScannerAlive()
-{
- RadioFrequencyScanner* scanner = instance().mScanner;
- if ( scanner ) {
- return scanner->isAlive();
- }
- return false;
-}
-
-/*!
- *
- */
-void RadioUiUtilities::setFrequencyStrip( RadioFrequencyStrip* frequencyStrip )
-{
- instance().mFrequencyStrip = frequencyStrip;
-}
-
-/*!
- *
- */
-void RadioUiUtilities::setCarousel( RadioStationCarousel* carousel )
-{
- instance().mCarousel = carousel;
-}
-
-/*!
- *
- */
-void RadioUiUtilities::setFrequencyScanner( RadioFrequencyScanner* scanner )
-{
- instance().mScanner = scanner;
-}
-
-/*!
- *
- */
-RadioUiUtilities& RadioUiUtilities::instance()
-{
- if ( !::theInstance ) {
- ::theInstance = new RadioUiUtilities;
- }
- return *::theInstance;
-}
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/src/radioutil.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,194 @@
+/*
+* 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 <HbEffect>
+#include <HbNotificationDialog>
+
+// User includes
+#include "radioutil.h"
+#include "radiofrequencystrip.h"
+#include "radiostationcarousel.h"
+#include "radiofrequencyscanner.h"
+#include "radiologger.h"
+
+// Constants
+
+static RadioUtil* theInstance = 0;
+
+/*!
+ *
+ */
+RadioUtil::RadioUtil() :
+ mScanStatus( Scan::NotScanning )
+{
+}
+
+/*!
+ *
+ */
+RadioUtil::~RadioUtil()
+{
+}
+
+/*!
+ *
+ */
+bool RadioUtil::addEffects( QEffectList list )
+{
+ bool allAvailable = true;
+ QEffectList added;
+ foreach ( EffectInfo info, list ) {
+#ifdef USE_LAYOUT_FROM_E_DRIVE
+ info.mPath.replace( QString( ":/" ), QString( "e:/radiotest/" ) );
+#endif
+ if ( HbEffect::add( info.mItem, info.mPath, info.mEvent ) ) {
+ added.append( info );
+ } else {
+ allAvailable = false;
+ break;
+ }
+ }
+
+ if ( !allAvailable ) {
+ foreach ( const EffectInfo& info, added ) {
+ HbEffect::remove( info.mItem, info.mPath, info.mEvent );
+ }
+ }
+
+ return allAvailable;
+}
+
+
+/*!
+ *
+ */
+RadioFrequencyStrip* RadioUtil::frequencyStrip()
+{
+ return instance().mFrequencyStrip;
+}
+
+/*!
+ *
+ */
+RadioStationCarousel* RadioUtil::carousel()
+{
+ return instance().mCarousel;
+}
+
+/*!
+ *
+ */
+bool RadioUtil::isScannerAlive()
+{
+ RadioFrequencyScanner* scanner = instance().mScanner;
+ if ( scanner ) {
+ return scanner->isAlive();
+ }
+ return false;
+}
+
+/*!
+ *
+ */
+Scan::Status RadioUtil::scanStatus()
+{
+ return instance().mScanStatus;
+}
+
+/*!
+ *
+ */
+void RadioUtil::setFrequencyStrip( RadioFrequencyStrip* frequencyStrip )
+{
+ instance().mFrequencyStrip = frequencyStrip;
+}
+
+/*!
+ *
+ */
+void RadioUtil::setCarousel( RadioStationCarousel* carousel )
+{
+ instance().mCarousel = carousel;
+}
+
+/*!
+ *
+ */
+void RadioUtil::setFrequencyScanner( RadioFrequencyScanner* scanner )
+{
+ instance().mScanner = scanner;
+}
+
+/*!
+ *
+ */
+void RadioUtil::setScanStatus( Scan::Status status )
+{
+ instance().mScanStatus = status;
+}
+
+/*!
+ *
+ */
+Scroll::Direction RadioUtil::scrollDirectionFromSkipMode( int skipMode )
+{
+ return ( skipMode == StationSkip::Next || skipMode == StationSkip::NextFavorite )
+ ? Scroll::Left : Scroll::Right;
+}
+
+/*!
+ *
+ */
+Scroll::Direction RadioUtil::scrollDirection( int direction )
+{
+ return static_cast<Scroll::Direction>( direction );
+}
+
+/*!
+ *
+ */
+TuneReason::Reason RadioUtil::tuneReason( int tuneReason )
+{
+ return static_cast<TuneReason::Reason>( tuneReason );
+}
+
+/*!
+ *
+ */
+void RadioUtil::showDiscreetNote( const QString& text )
+{
+ RadioUtil& self = instance();
+ if ( !self.mNotificationDialog ) {
+ self.mNotificationDialog = new HbNotificationDialog();
+ }
+ self.mNotificationDialog->setAttribute( Qt::WA_DeleteOnClose );
+ self.mNotificationDialog->setTitle( text );
+ self.mNotificationDialog->show();
+}
+
+/*!
+ *
+ */
+RadioUtil& RadioUtil::instance()
+{
+ if ( !::theInstance ) {
+ ::theInstance = new RadioUtil;
+ }
+ return *::theInstance;
+}
+
--- a/radioapp/radiowidgets/src/radioviewbase.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radioviewbase.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -35,7 +35,6 @@
HbView( 0 ),
mMainWindow( 0 ),
mUiLoader( 0 ),
- mInitialized( false ),
mTransientView( transient ),
mUseLoudspeakerAction( 0 ),
mOrientation( Qt::Vertical )
@@ -55,10 +54,19 @@
/*!
*
*/
-void RadioViewBase::setMembers( RadioUiLoader* uiLoader, RadioWindow* mainWindow )
+void RadioViewBase::setMembers( RadioWindow* mainWindow, RadioUiLoader* uiLoader )
{
+ mMainWindow = mainWindow;
mUiLoader.reset( uiLoader );
- mMainWindow = mainWindow;
+}
+
+/*!
+ *
+ */
+void RadioViewBase::initialize( QSharedPointer<RadioUiEngine> uiEngine )
+{
+ mUiEngine = uiEngine;
+ init();
}
/*!
@@ -66,7 +74,7 @@
*/
bool RadioViewBase::isInitialized() const
{
- return mInitialized;
+ return mUiEngine;
}
/*!
@@ -89,6 +97,14 @@
}
/*!
+ *
+ */
+void RadioViewBase::bringToForeground()
+{
+ mMainWindow->raise();
+}
+
+/*!
* Protected slot
*
*/
@@ -120,7 +136,6 @@
/*!
* Private slot
- * TODO: Refactor this awkwardness once Orbit figures out a better way
*/
void RadioViewBase::handleUserAnswer( HbAction* answer )
{
@@ -137,9 +152,9 @@
{
// The default back button activates the tuning view
HbAction* backAction = new HbAction( Hb::BackNaviAction, this );
- connectAndTest( backAction, SIGNAL(triggered()),
+ Radio::connect( backAction, SIGNAL(triggered()),
mMainWindow, SLOT(activateMainView()) );
- setNavigationAction( backAction );
+ setNavigationAction( backAction );
}
/*!
@@ -147,14 +162,19 @@
*/
void RadioViewBase::connectCommonMenuItem( int menuItem )
{
- RadioUiEngine* engine = &mMainWindow->uiEngine();
switch ( menuItem ) {
case MenuItem::UseLoudspeaker:
mUseLoudspeakerAction = mUiLoader->findObject<HbAction>( DOCML::NAME_LOUDSPEAKER_ACTION );
if ( mUseLoudspeakerAction ) {
- connectAndTest( mUseLoudspeakerAction, SIGNAL(triggered()), engine, SLOT(toggleAudioRoute()) );
- updateAudioRouting( engine->isUsingLoudspeaker() );
- connectAndTest( engine, SIGNAL(audioRouteChanged(bool)), this, SLOT(updateAudioRouting(bool)) );
+ Radio::connect( mUseLoudspeakerAction, SIGNAL(triggered()), mUiEngine.data(), SLOT(toggleAudioRoute()) );
+ updateAudioRouting( mUiEngine->isUsingLoudspeaker() );
+ Radio::connect( mUiEngine.data(), SIGNAL(audioRouteChanged(bool)), this, SLOT(updateAudioRouting(bool)) );
+ }
+ break;
+
+ case MenuItem::Exit:
+ if ( HbAction* exitAction = mUiLoader->findObject<HbAction>( DOCML::NAME_EXIT_ACTION ) ) {
+ Radio::connect( exitAction, SIGNAL(triggered()), this, SLOT(quit()) );
}
break;
@@ -166,10 +186,10 @@
/*!
*
*/
-void RadioViewBase::connectXmlElement( const char* name, const char* signal, QObject* receiver, const char* slot )
+void RadioViewBase::connectXmlElement( const QString& name, const char* signal, QObject* receiver, const char* slot )
{
if ( QObject* action = mUiLoader->findObject<QObject>( name ) ) {
- connectAndTest( action, signal, receiver, slot );
+ Radio::connect( action, signal, receiver, slot );
}
}
@@ -179,7 +199,7 @@
void RadioViewBase::connectViewChangeMenuItem( QString name, const char* slot )
{
if ( QObject* action = mUiLoader->findObject<QObject>( name ) ) {
- connectAndTest( action, SIGNAL(triggered()), mMainWindow, slot );
+ Radio::connect( action, SIGNAL(triggered()), mMainWindow, slot );
}
}
@@ -189,7 +209,7 @@
void RadioViewBase::loadSection( const QString& docml, const QString& section )
{
LOG_FORMAT( "RadioViewBase::loadSection: Docml: %s, section: %s", GETSTRING( docml ), GETSTRING( section ) );
- bool ok = false;
+ bool ok = false;
mUiLoader->load( docml, section, &ok );
LOG_ASSERT( ok, LOG_FORMAT( "Loading of section %s failed!", GETSTRING( section ) ) );
}
--- a/radioapp/radiowidgets/src/radiowindow.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgets/src/radiowindow.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -25,6 +25,7 @@
#include "radiowindow.h"
#include "radiomainview.h"
#include "radiostationsview.h"
+#include "radiohistoryview.h"
#include "radiouiengine.h"
#include "radiostationmodel.h"
#include "radiologger.h"
@@ -33,16 +34,15 @@
// Constants
/**
- * Desired amount of delay of volumesliderpopup
+ * Timeout for volumesliderpopup
*/
-const int KVolumeSliderDelay = 5000;
+const int VOLUME_POPUP_TIMEOUT = 5000;
/*!
*
*/
RadioWindow::RadioWindow( QWidget* parent ) :
- HbMainWindow( parent ),
- mUiEngine( new RadioUiEngine( this ) )
+ HbMainWindow( parent )
{
}
@@ -62,29 +62,25 @@
HbDeviceMessageBox box( text, HbMessageBox::MessageTypeWarning );
box.setTimeout( HbPopup::NoTimeout );
box.setDismissPolicy( HbPopup::NoDismiss );
- box.exec();
+ box.show();
}
/*!
*
*/
-void RadioWindow::init()
+void RadioWindow::init( QSystemDeviceInfo* deviceInfo )
{
- connectAndTest( this, SIGNAL(viewReady()),
- this, SLOT(initView()) );
+ mDeviceInfo.reset( deviceInfo );
+
+ Radio::connect( this, SIGNAL(viewReady()),
+ this, SLOT(initView()) );
+ Radio::connect( mDeviceInfo.data(), SIGNAL(currentProfileChanged(QSystemDeviceInfo::Profile)),
+ this, SLOT(queryOfflineUsage(QSystemDeviceInfo::Profile)) );
activateMainView();
}
/*!
- *
- */
-RadioUiEngine& RadioWindow::uiEngine()
-{
- return *mUiEngine;
-}
-
-/*!
* Returns the XML layout section that corresponds to the view orientation
*/
QString RadioWindow::orientationSection()
@@ -97,6 +93,9 @@
*/
void RadioWindow::activateMainView()
{
+ if ( !mMainView ) {
+ mMainView = ViewPtr( new RadioMainView() );
+ }
activateView( mMainView, DOCML::FILE_MAINVIEW, Hb::ViewSwitchUseBackAnim );
}
@@ -105,6 +104,9 @@
*/
void RadioWindow::activateStationsView()
{
+ if ( !mStationsView ) {
+ mStationsView = ViewPtr( new RadioStationsView() );
+ }
activateView( mStationsView, DOCML::FILE_STATIONSVIEW );
}
@@ -113,6 +115,9 @@
*/
void RadioWindow::activateHistoryView()
{
+ if ( !mHistoryView ) {
+ mHistoryView = ViewPtr( new RadioHistoryView() );
+ }
activateView( mHistoryView, DOCML::FILE_HISTORYVIEW );
}
@@ -122,7 +127,9 @@
*/
void RadioWindow::initView()
{
- if ( !mUiEngine->isInitialized() ) {
+ if ( !mUiEngine ) {
+ mUiEngine = QSharedPointer<RadioUiEngine>( new RadioUiEngine( this ) );
+
// Start the engine
if ( !mUiEngine->init() ) {
showErrorMessage( hbTrId( "txt_fmradio_info_fm_radio_could_not_be_started" ) );
@@ -132,18 +139,20 @@
// MainWindow is the one that always listens for orientation changes and then delegates
// the updates to the views
- connectAndTest( this, SIGNAL(orientationChanged(Qt::Orientation)),
+ Radio::connect( this, SIGNAL(orientationChanged(Qt::Orientation)),
this, SLOT(updateOrientation(Qt::Orientation)) );
- connectAndTest( mUiEngine.data(), SIGNAL(volumeChanged(int)),
+ Radio::connect( mUiEngine.data(), SIGNAL(volumeChanged(int)),
this, SLOT(showVolumeLevel(int)) );
- connectAndTest( mUiEngine.data(), SIGNAL(antennaStatusChanged(bool)),
+ Radio::connect( mUiEngine.data(), SIGNAL(antennaStatusChanged(bool)),
this, SLOT(updateAntennaStatus(bool)) );
+ Radio::connect( mUiEngine.data(), SIGNAL(powerOffRequested()),
+ qApp, SLOT(quit()) );
}
RadioViewBase* view = static_cast<RadioViewBase*>( currentView() );
if ( !view->isInitialized() ) {
- view->init();
+ view->initialize( mUiEngine );
}
}
@@ -168,15 +177,16 @@
{
if ( !mVolSlider ) {
mVolSlider.reset( new HbVolumeSliderPopup() );
- mVolSlider->setRange( 0, KMaximumVolumeLevel );
+ mVolSlider->setRange( 0, MAXIMUM_VOLUME_LEVEL );
mVolSlider->setSingleStep( 1 );
- mVolSlider->setTimeout( KVolumeSliderDelay );
- connectAndTest( mVolSlider.data(), SIGNAL(valueChanged(int)),
+ mVolSlider->setTimeout( VOLUME_POPUP_TIMEOUT );
+ Radio::connect( mVolSlider.data(), SIGNAL(valueChanged(int)),
mUiEngine.data(), SLOT(setVolume(int)) );
}
mVolSlider->setValue( volume );
- mVolSlider->setText( QString( "%L1%" ).arg( volume * 100 / KMaximumVolumeLevel ) );
+ //TODO: Check if this should be localized
+ mVolSlider->setText( QString( "%L1%" ).arg( volume * 100 / MAXIMUM_VOLUME_LEVEL ) );
mVolSlider->show();
}
@@ -187,14 +197,45 @@
void RadioWindow::updateAntennaStatus( bool connected )
{
if ( !connected ) {
- HbMessageBox::information( hbTrId( "txt_rad_dpophead_connect_wired_headset" ) );
+ if ( !mMessageBox ) {
+ mMessageBox.reset( new HbMessageBox() );
+ }
+ mMessageBox->setText( hbTrId( "txt_rad_dpophead_connect_wired_headset" ) );
+ mMessageBox->setDismissPolicy( HbPopup::NoDismiss );
+ mMessageBox->setTimeout( HbPopup::NoTimeout );
+// mMessageBox->setAttribute( Qt::WA_DeleteOnClose, true );
+ mMessageBox->open();
+ } else {
+ mMessageBox.reset();
}
}
/*!
+ * Private slot
+ *
+ */
+void RadioWindow::queryOfflineUsage( QSystemDeviceInfo::Profile profile )
+{
+ if ( profile == QSystemDeviceInfo::OfflineProfile ) {
+ bool okToContinue = false;
+ HbDeviceMessageBox box( hbTrId( "txt_rad_info_continue_using_the_radio_in_offline" ), HbMessageBox::MessageTypeQuestion );
+ box.setTimeout( HbPopup::NoTimeout );
+ box.exec();
+
+ okToContinue = box.isAcceptAction( box.triggeredAction() );
+
+ if ( okToContinue ) {
+ // Radio stays on
+ } else {
+ qApp->quit(); // Close radio
+ }
+ } // other profiles are not interesting
+}
+
+/*!
*
*/
-void RadioWindow::activateView( ViewPtr& aMember, const QString& docmlFile, Hb::ViewSwitchFlags flags )
+void RadioWindow::activateView( RadioViewBase* aMember, const QString& docmlFile, Hb::ViewSwitchFlags flags )
{
LOG_METHOD;
if ( aMember && aMember == currentView() ) {
@@ -208,32 +249,29 @@
}
bool viewCreated = false;
- if ( !aMember ) {
+ if ( !aMember->isInitialized() ) {
viewCreated = true;
- RadioUiLoader* uiLoader = new RadioUiLoader();
- bool ok = false;
+ QScopedPointer<RadioUiLoader> uiLoader( new RadioUiLoader() );
- // View takes ownership of the ui loader when it is created inside the load function
- QObjectList objectList = uiLoader->load( docmlFile, &ok );
+ // By default the document loader would create a new HbView instance for our view so we need
+ // to use a silly little hack to prevent it. We call our view "view" and pass it to the document loader
+ // so it already exists.
+ aMember->setObjectName( DOCML::NAME_VIEW );
+ QObjectList objectList;
+ objectList.append( aMember );
+ uiLoader->setObjectTree( objectList );
+
+ bool ok = false;
+ uiLoader->load( docmlFile, &ok );
RADIO_ASSERT( ok , "FMRadio", "invalid DocML file" );
if ( !ok ) {
- delete uiLoader;
- uiLoader = 0;
+ uiLoader.reset();
return;
}
- aMember = ViewPtr( uiLoader->findObject<RadioViewBase>( DOCML::NAME_VIEW ) );
-
- foreach( QObject* object, objectList ) {
- const QString className = object->metaObject()->className();
- if ( !object->parent() && object != aMember.data() ) {
- object->setParent( aMember.data() );
- }
- }
-
- aMember->setMembers( uiLoader, this );
+ aMember->setMembers( this, uiLoader.take() );
addView( aMember );
}
--- a/radioapp/radiowidgetsplugin/main.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgetsplugin/main.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -20,12 +20,8 @@
#include <hbdocumentloaderplugin>
// User includes
-#include "radiostationsview.h"
-#include "radiomainview.h"
-#include "radiohistoryview.h"
#include "radiostationcarousel.h"
#include "radiofrequencystrip.h"
-#include "radiobannerlabel.h"
#include "radiofadinglabel.h"
// Class declaration
@@ -47,18 +43,10 @@
{
QObject* object = 0;
- if ( type == RadioMainView::staticMetaObject.className() ) {
- object = new RadioMainView();
- } else if ( type == RadioStationsView::staticMetaObject.className() ) {
- object = new RadioStationsView();
- } else if ( type == RadioHistoryView::staticMetaObject.className() ) {
- object = new RadioHistoryView();
- } else if ( type == RadioStationCarousel::staticMetaObject.className() ) {
+ if ( type == RadioStationCarousel::staticMetaObject.className() ) {
object = new RadioStationCarousel();
} else if ( type == RadioFrequencyStrip::staticMetaObject.className() ) {
object = new RadioFrequencyStrip();
- } else if ( type == RadioBannerLabel::staticMetaObject.className() ) {
- object = new RadioBannerLabel();
} else if ( type == RadioFadingLabel::staticMetaObject.className() ) {
object = new RadioFadingLabel();
}
@@ -76,10 +64,6 @@
QList<const QMetaObject *> RadioWidgetsPlugin::supportedObjects()
{
QList<const QMetaObject *> result;
- result.append( &RadioMainView::staticMetaObject );
- result.append( &RadioStationsView::staticMetaObject );
- result.append( &RadioHistoryView::staticMetaObject );
- result.append( &RadioBannerLabel::staticMetaObject );
result.append( &RadioFadingLabel::staticMetaObject );
result.append( &RadioFrequencyStrip::staticMetaObject );
result.append( &RadioStationCarousel::staticMetaObject );
--- a/radioapp/radiowidgetsplugin/radiowidgetsplugin.pro Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiowidgetsplugin/radiowidgetsplugin.pro Fri Jun 11 13:38:32 2010 +0300
@@ -14,28 +14,24 @@
# Description:
#
-TEMPLATE = lib
-TARGET = radiowidgetsplugin
+include(../buildflags.pri)
-win32: {
- DESTDIR = ../bin
- LIBS += -L../bin
-}
+TEMPLATE = lib
+TARGET = fmradiowidgetsplugin
+symbian:TARGET.UID3 = 0x2002FF4D
CONFIG += hb plugin
QT += core
INCLUDEPATH += ../radiowidgets/inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
symbian: {
- TARGET.EPOCALLOWDLLDATA = 1
- TARGET.CAPABILITY = CAP_GENERAL_DLL
- pluginstub.sources = radiowidgetsplugin.dll
+ pluginstub.sources = fmradiowidgetsplugin.dll
pluginstub.path = /resource/plugins
DEPLOYMENT += pluginstub
}
SOURCES += main.cpp
-LIBS += -lradiowidgets
+LIBS += -lfmradiowidgets
--- a/radioengine/engine/api/cradioengine.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/api/cradioengine.h Fri Jun 11 13:38:32 2010 +0300
@@ -15,7 +15,6 @@
*
*/
-
#ifndef CRADIOENGINE_H_
#define CRADIOENGINE_H_
@@ -31,11 +30,9 @@
class MRadioApplicationSettings;
class MRadioEngineSettings;
class CRadioSystemEventCollector;
-class CRadioPubSub;
class CRadioRepositoryManager;
class MRadioPresetSettings;
class MRadioSettingsSetter;
-class MRadioScanObserver;
class MRadioEngineObserver;
class MRadioRdsReceiver;
@@ -76,13 +73,6 @@
virtual CRadioSettings& Settings() const = 0;
/**
- * Returns a reference to the publish & subscribe handler
- *
- * @return Reference to the publish & subscribe handler
- */
- virtual CRadioPubSub* PubSub() const = 0;
-
- /**
* Determines radio region
*/
virtual TRadioRegion DetermineRegion() = 0;
@@ -91,9 +81,8 @@
* ( Re )initializes the radio.
*
* @param aRegionId Region id
- * @param aPubSub Pointer to Publish&Subscribe object
*/
- virtual void InitRadioL( TInt aRegionId, CRadioPubSub* aPubSub = 0 ) = 0;
+ virtual void InitRadioL( TInt aRegionId ) = 0;
/**
* Has the radio been initialized
@@ -163,6 +152,18 @@
virtual TBool IsFrequencyValid( TUint32 aFrequency = 0 ) const = 0;
/**
+ * Sets or unsets the manual seek mode
+ *
+ * @param aManualSeekActive ETrue if active EFalse if not
+ */
+ virtual void SetManualSeekMode( TBool aManualSeekActive ) = 0;
+
+ /**
+ * Returns the manual seek mode status
+ */
+ virtual TBool IsInManualSeekMode() const = 0;
+
+ /**
* Tunes to frequency
* If radio is not initialized by InitRadioL, frequency is just
* set to settings.
@@ -174,20 +175,6 @@
RadioEngine::TRadioFrequencyEventReason aReason = RadioEngine::ERadioFrequencyEventReasonUnknown ) = 0;
/**
- * Test function to try to make the tuning as fast as possible.
- * Use with care since this will skip a lot of checks done by the SetFrequency() function
- */
- virtual void SetFrequencyFast( TUint32 aFrequency,
- RadioEngine::TRadioFrequencyEventReason aReason = RadioEngine::ERadioFrequencyEventReasonUnknown ) = 0;
-
- /**
- * Steps to next frequency according to direction
- *
- * @param aDirection The direciton to step to
- */
- virtual void StepToFrequency( RadioEngine::TRadioTuneDirection aDirection ) = 0;
-
- /**
* Performs seeking operation.
*
* @param aDirection direction of seeking operation.
@@ -207,25 +194,6 @@
virtual RadioEngine::TRadioSeeking Seeking() const = 0;
/**
- * Starts scanning all available stations from the minimum frequency
- *
- * Calling this method also cancels any existing scan or seek operations.
- *
- * @param aObserver Observer to be notified of the progress of the scan.
- * If a scan is currently in progress or the radio is not on, then
- * the new scan is not performed at all and an error is passed on completion event.
- *
- */
- virtual void StartScan( MRadioScanObserver& aObserver ) = 0;
-
- /**
- * Stops any scans currently in progress and notifies the observer
- *
- * @param aError The error code for completing the scanning.
- */
- virtual void StopScan( TInt aError = KErrCancel ) = 0;
-
- /**
* Changes volume by one level.
*
* @param aDirection Direction of the volume change.
@@ -244,7 +212,7 @@
*
* @param aMute mute status.
*/
- virtual void SetVolumeMuted( TBool aMute ) = 0;
+ virtual void SetVolumeMuted( TBool aMute, TBool aUpdateSettings = ETrue ) = 0;
/**
* Retrieves current antenna state.
--- a/radioengine/engine/api/mradioengineinitializer.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/api/mradioengineinitializer.h Fri Jun 11 13:38:32 2010 +0300
@@ -27,7 +27,6 @@
class CRadioSystemEventCollector;
class CRadioSettings;
class CRadioEngine;
-class CRadioPubSub;
NONSHARABLE_CLASS( MRadioEngineInitializer )
{
@@ -36,7 +35,6 @@
virtual CRadioAudioRouter* InitAudioRouterL() = 0;
virtual CRadioSystemEventCollector* InitSystemEventCollectorL() = 0;
virtual CRadioSettings* InitSettingsL() = 0;
- virtual CRadioPubSub* InitPubSubL() = 0;
};
--- a/radioengine/engine/api/mradiordsreceiver.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/api/mradiordsreceiver.h Fri Jun 11 13:38:32 2010 +0300
@@ -20,7 +20,6 @@
// Forward declarations
class CRadioUtility;
-class CRadioPubSub;
class MRadioRdsDataObserver;
NONSHARABLE_CLASS( MRadioRdsReceiver )
@@ -33,7 +32,7 @@
* @param aRadioUtility A reference to the radio utility
* @param aPubSub Pointer to Publish&Subscribe object
*/
- virtual void InitL( CRadioUtility& aRadioUtility, CRadioPubSub* aPubSub ) = 0;
+ virtual void InitL( CRadioUtility& aRadioUtility ) = 0;
/**
* Adds an observer wich will be notified of the new RDS data
--- a/radioengine/engine/api/mradioscanobserver.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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 MRADIOSCANOBSERVER_H_
-#define MRADIOSCANOBSERVER_H_
-
-/**
- * Interface for radio station scanning.
- *
- * Implementers of this interface are able to receive notifications
- * when scanning finds a valid frequency and upon its completion.
- */
-NONSHARABLE_CLASS( MRadioScanObserver )
- {
-
-public:
-
- /**
- * Invoked when a frequency has been found with scanning.
- *
- * @param aFrequency The frequency, in kilohertz, that was found.
- */
- virtual void ScanFrequencyEventL( TUint32 aFrequency ) = 0;
-
- /**
- * Invoked when a scan has been completed.
- *
- * @param aError <code>KErrNone</code> when the scan was successfull,
- * or any of the standard error codes otherwise.
- */
- virtual void ScanCompletedEventL( TInt aError ) = 0;
-
- };
-
-#endif // MRADIOSCANOBSERVER_H_
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/engine/bwins/fmradioengineu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ ??1CRadioEngine@@UAE@XZ @ 1 NONAME ; CRadioEngine::~CRadioEngine(void)
+ ?NewL@CRadioEngine@@SAPAV1@AAVMRadioEngineInitializer@@@Z @ 2 NONAME ; class CRadioEngine * CRadioEngine::NewL(class MRadioEngineInitializer &)
+
--- a/radioengine/engine/bwins/radioengineu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- ??1CRadioEngine@@UAE@XZ @ 1 NONAME ; CRadioEngine::~CRadioEngine(void)
- ?NewL@CRadioEngine@@SAPAV1@AAVMRadioEngineInitializer@@@Z @ 2 NONAME ; class CRadioEngine * CRadioEngine::NewL(class MRadioEngineInitializer &)
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/engine/eabi/fmradioengineu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,6 @@
+EXPORTS
+ _ZN12CRadioEngine4NewLER23MRadioEngineInitializer @ 1 NONAME
+ _ZN12CRadioEngineD0Ev @ 2 NONAME
+ _ZN12CRadioEngineD1Ev @ 3 NONAME
+ _ZN12CRadioEngineD2Ev @ 4 NONAME
+
--- a/radioengine/engine/eabi/radioengineu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
- _ZN12CRadioEngine4NewLER23MRadioEngineInitializer @ 1 NONAME
- _ZN12CRadioEngineD0Ev @ 2 NONAME
- _ZN12CRadioEngineD1Ev @ 3 NONAME
- _ZN12CRadioEngineD2Ev @ 4 NONAME
-
--- a/radioengine/engine/group/radioengine.mmp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/group/radioengine.mmp Fri Jun 11 13:38:32 2010 +0300
@@ -21,9 +21,9 @@
#include <data_caging_paths.hrh>
-TARGET radioengine.dll
+TARGET fmradioengine.dll
TARGETTYPE DLL
-UID 0x1000008D 0x10281CB2
+UID 0x1000008D 0x2002FF4F
VERSION 11.0
CAPABILITY CAP_GENERAL_DLL
@@ -38,11 +38,6 @@
SOURCE cradiordsreceiverbase.cpp
SOURCE cradionetworkinfolistener.cpp
-#ifdef __FEATURE_RDS_SIMULATOR
-MACRO __FEATURE_RDS_SIMULATOR
-SOURCE t_cradiordsreceiversimulator.cpp
-#endif // __FEATURE_RDS_SIMULATOR
-
USERINCLUDE ../api
USERINCLUDE ../inc
USERINCLUDE ../../utils/api
@@ -52,8 +47,8 @@
// Default system include paths for application layer modules.
APP_LAYER_SYSTEMINCLUDE
-LIBRARY radioengineutils.lib
-LIBRARY radioenginesettings.lib
+LIBRARY fmradioengineutils.lib
+LIBRARY fmradioenginesettings.lib
LIBRARY AudioOutputRouting.lib
LIBRARY euser.lib
--- a/radioengine/engine/inc/cradioengineimp.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/inc/cradioengineimp.h Fri Jun 11 13:38:32 2010 +0300
@@ -36,7 +36,6 @@
class MRadioEngineSettings;
class MRadioSettingsSetter;
class MRadioEngineObserver;
-class MRadioScanObserver;
/**
* Radio class takes care of the FM-radio side.
@@ -56,7 +55,6 @@
void SetSystemEventCollector( CRadioSystemEventCollector* aCollector );
void SetRadioSettings( CRadioSettings* aSettings );
- void SetRadioPubSub( CRadioPubSub* aPubSub );
private:
@@ -67,9 +65,8 @@
CRadioAudioRouter& AudioRouter() const;
CRadioSystemEventCollector& SystemEventCollector() const;
CRadioSettings& Settings() const;
- CRadioPubSub* PubSub() const;
TRadioRegion DetermineRegion();
- void InitRadioL( TInt aRegionId, CRadioPubSub* aPubSub = 0 );
+ void InitRadioL( TInt aRegionId );
TBool RadioInitialized() const;
void EnableAudio( TBool aEnable, TBool aDelay = ETrue );
TBool RadioAudioEnabled() const;
@@ -78,19 +75,16 @@
void RemoveObserver( MRadioEngineObserver* aObserver );
void SetAudioMode( TInt aAudioMode );
TBool IsFrequencyValid( TUint32 aFrequency = 0 ) const;
+ void SetManualSeekMode( TBool aManualSeekActive );
+ TBool IsInManualSeekMode() const;
void SetFrequency( TUint32 aFrequency,
RadioEngine::TRadioFrequencyEventReason aReason = RadioEngine::ERadioFrequencyEventReasonUnknown );
- void SetFrequencyFast( TUint32 aFrequency,
- RadioEngine::TRadioFrequencyEventReason aReason = RadioEngine::ERadioFrequencyEventReasonUnknown );
- void StepToFrequency( RadioEngine::TRadioTuneDirection aDirection );
void Seek( RadioEngine::TRadioTuneDirection aDirection );
void CancelSeek();
RadioEngine::TRadioSeeking Seeking() const;
- void StartScan( MRadioScanObserver& aObserver );
- void StopScan( TInt aError = KErrCancel );
void AdjustVolume( RadioEngine::TRadioVolumeSetDirection aDirection );
void SetVolume( TInt aVolume );
- void SetVolumeMuted( TBool aMute );
+ void SetVolumeMuted( TBool aMute, TBool aUpdateSettings = ETrue );
TBool IsAntennaAttached();
TBool IsFmTransmitterActive() const;
void SetAntennaAttached( TBool aAntennaAttached );
@@ -201,26 +195,6 @@
void DoNotifyRadioEventL( TInt aRadioEvent, TInt aErrorCode = KErrNone );
/**
- * Notifies the observer of a radio scan event.
- *
- * @param aEvent Event to notify.
- * @param aObserver Scan observer.
- * @param aError Error code the event completed with.
- */
- void NotifyRadioScanEvent( TRadioScanEvent aEvent, MRadioScanObserver& aObserver,
- TInt aError = KErrNone );
-
- /**
- * Notifies the observer of a radio scan event.
- *
- * @param aEvent Event to notify.
- * @param aObserver Scan observer.
- * @param aError Error code the event completed with.
- */
- void DoNotifyRadioScanEventL( TRadioScanEvent aEvent, MRadioScanObserver& aObserver,
- TInt aError );
-
- /**
* Handles the change in audio routing
*
* @param aDestination The new routing destination
@@ -401,18 +375,6 @@
RadioEngine::TRadioFrequencyEventReason iFreqEventReason;
/**
- * Publish&Subscribe object. Can be NULL.
- * Owned if set
- */
- CRadioPubSub* iPubSub;
-
- /**
- * Radio scan observer. NULL when scanning is not ongoing
- * Not owned.
- */
- MRadioScanObserver* iScanObserver;
-
- /**
* The previously scanned frequency, or <code>KErrNotFound</code> if none.
*/
TUint32 iPreviousScannedFrequency;
@@ -422,6 +384,11 @@
*/
TBool iPreviousMuteState;
+ /**
+ * Manual seek mode flag
+ */
+ TBool iManualSeekMode;
+
};
#endif // CRADIOENGINEIMP_H
--- a/radioengine/engine/inc/cradiordsreceiver.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/inc/cradiordsreceiver.h Fri Jun 11 13:38:32 2010 +0300
@@ -41,7 +41,7 @@
// from base class MRadioRdsReceiver
- void InitL( CRadioUtility& aRadioUtility, CRadioPubSub* aPubSub );
+ void InitL( CRadioUtility& aRadioUtility );
void SetAutomaticSwitchingL( TBool aEnable );
void StartReceiver();
void StopReceiver();
--- a/radioengine/engine/inc/cradiordsreceiverbase.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/inc/cradiordsreceiverbase.h Fri Jun 11 13:38:32 2010 +0300
@@ -28,7 +28,6 @@
// Forward declarations
class CRadioUtility;
-class CRadioPubSub;
// Class declaration
NONSHARABLE_CLASS( CRadioRdsReceiverBase ) : public CBase
@@ -132,12 +131,6 @@
*/
MRadioEngineSettings& iSettings;
- /**
- * Publish&Subscribe object. Can be NULL.
- * Not own.
- */
- CRadioPubSub* iPubSub;
-
private: // data
/**
--- a/radioengine/engine/inc/t_cradiordsreceiversimulator.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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 T_CRADIORDSRECEIVERSIMULATOR_H
-#define T_CRADIORDSRECEIVERSIMULATOR_H
-
-// User includes
-#include "mradiordsdataobserver.h"
-#include "cradiordsreceiverbase.h"
-
-// Class declaration
-NONSHARABLE_CLASS( CRadioRdsReceiverSimulator ) : public CRadioRdsReceiverBase
- {
-public:
-
- static CRadioRdsReceiverSimulator* NewL( MRadioEngineSettings& aSettings );
-
- virtual ~CRadioRdsReceiverSimulator();
-
-// from base class MRadioRdsReceiver
-
- void InitL( CRadioUtility& aRadioUtility, CRadioPubSub* aPubSub );
- void StartReceiver();
- void StopReceiver();
-
-private:
-
- /** The simulated events */
- enum TRadioRdsSimulationEvent
- {
- ERadioRdsEventSignalOn,
- ERadioRdsEventSignalOff,
- ERadioRdsEventPS,
- ERadioRdsEventAFBegin,
- ERadioRdsEventAFEnd,
- ERadioRdsEventRadioText,
- ERadioRdsEventRadioTextPlus
- };
-
- CRadioRdsReceiverSimulator( MRadioEngineSettings& aSettings );
-
- void ConstructL();
-
- void ParseRdsDataL();
-
- void startRTPlusTimer();
-
- /**
- * StaticRdsSimulationCallback Callback for RDS simulation
- */
- static TInt StaticRdsSimulationCallback( TAny* aSelfPtr );
-
- /**
- * Callback for RT+ simulation
- */
- static TInt StaticRdsSimulationCallback2( TAny* aSelfPtr );
-
-private: // data
-
- /** Timer for RDS event simulation */
- CPeriodic* iEventSimulatorTimer;
-
- /** Timer for RT+ events */
- CPeriodic* iEventSimulatorTimer2;
-
- /** The iterator for RDS events */
- TInt iEventIterator;
-
- /** The iterator for RT+ events */
- TInt iRtPlusIterator;
-
- /** The iterator for RT events */
- TInt iRtIterator;
-
- /** The iterator for PS names */
- TInt iPsIterator;
-
- /** The iterator for frequencies */
- TInt iFrequencyIterator;
-
- /** The iterator for RT and RT+ information */
- TInt iRadioTextIterator;
-
- };
-
-#endif // T_CRADIORDSRECEIVERSIMULATOR_H
--- a/radioengine/engine/src/cradioengine.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/src/cradioengine.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -20,6 +20,7 @@
#include "cradioengineimp.h"
#include "cradioenginelogger.h"
#include "mradioengineinitializer.h"
+#include "radioengineutils.h"
// ================= MEMBER FUNCTIONS =======================
@@ -29,6 +30,8 @@
//
EXPORT_C CRadioEngine* CRadioEngine::NewL( MRadioEngineInitializer& aInitializer )
{
+ RadioEngineUtils::InitializeL();
+ LEVEL3( LOG_METHOD_AUTO );
CRadioAudioRouter* audioRouter = aInitializer.InitAudioRouterL();
CleanupStack::PushL( audioRouter );
@@ -38,10 +41,9 @@
self->SetSystemEventCollector( aInitializer.InitSystemEventCollectorL() );
self->SetRadioSettings( aInitializer.InitSettingsL() );
- self->SetRadioPubSub( aInitializer.InitPubSubL() );
self->ConstructL();
- self->InitRadioL( self->DetermineRegion(), self->PubSub() );
+ self->InitRadioL( self->DetermineRegion() );
self->EnableAudio( ETrue );
CleanupStack::Pop( self );
@@ -55,6 +57,7 @@
CRadioEngine::CRadioEngine( CRadioAudioRouter* aAudioRouter )
: CRadioRoutableAudio( aAudioRouter )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -63,4 +66,5 @@
//
EXPORT_C CRadioEngine::~CRadioEngine()
{
+ RadioEngineUtils::Release();
}
--- a/radioengine/engine/src/cradioengineimp.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/src/cradioengineimp.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -24,27 +24,24 @@
// User includes
#include "cradioenginelogger.h"
-#include "radiointernalpskeys.h"
#include "radiointernalcrkeys.h"
#include "cradioaudiorouter.h"
-#include "cradiopubsub.h"
#include "cradioengineimp.h"
#include "mradioengineobserver.h"
-#include "mradioscanobserver.h"
#include "cradioregion.h"
#include "cradiosettings.h"
#include "mradioenginesettings.h"
#include "mradiosettingssetter.h"
-#include "cradiorepositorymanager.h"
#include "cradiordsreceiver.h"
#include "cradiosystemeventcollector.h"
#include "cradionetworkinfolistener.h"
#include "radioengine.hrh"
+#include "cradioenginelogger.h"
-#include "../../group/buildflags.hrh"
-#ifdef __FEATURE_RDS_SIMULATOR
-# include "t_cradiordsreceiversimulator.h"
-#endif
+// This has to be the last include.
+#ifdef STUB_CONSTELLATION
+# include <RadioStubManager.h>
+#endif //STUB_CONSTELLATION
// Constants
@@ -88,6 +85,7 @@
, iAntennaAttached( ETrue )
, iFreqEventReason( RadioEngine::ERadioFrequencyEventReasonUnknown )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -115,12 +113,7 @@
RadioEngine::ERadioHeadset : RadioEngine::ERadioSpeaker;
User::LeaveIfError( iSettings->RadioSetter().SetAudioRoute( route ) );
-#ifdef __FEATURE_RDS_SIMULATOR
- iRdsReceiver = CRadioRdsReceiverSimulator::NewL( iSettings->EngineSettings() );
-#else
iRdsReceiver = CRadioRdsReceiver::NewL( iSettings->EngineSettings() );
-#endif
-
iNetworkInfoListener = CRadioNetworkInfoListener::NewL( iSettings->RadioSetter(), NULL );
iRdsReceiver->AddObserverL( this );
@@ -135,7 +128,7 @@
//
CRadioEngineImp::~CRadioEngineImp()
{
- LOG( "CRadioEngineImp::~CRadioEngineImp -- Start" );
+ LEVEL3( LOG_METHOD_AUTO );
delete iNetworkInfoListener;
@@ -171,15 +164,12 @@
}
delete iSystemEventCollector;
- delete iPubSub;
-
if ( iSettings )
{
iSettings->RadioSetter().SetObserver( NULL );
}
delete iSettings;
- LOG( "CRadioEngineImp::~CRadioEngineImp -- End" );
}
// ---------------------------------------------------------------------------
@@ -188,6 +178,7 @@
//
void CRadioEngineImp::SetSystemEventCollector( CRadioSystemEventCollector* aCollector )
{
+ LEVEL3( LOG_METHOD_AUTO );
iSystemEventCollector = aCollector;
}
@@ -197,6 +188,7 @@
//
void CRadioEngineImp::SetRadioSettings( CRadioSettings* aSettings )
{
+ LEVEL3( LOG_METHOD_AUTO );
iSettings = aSettings;
iSettings->RadioSetter().SetObserver( this );
}
@@ -205,17 +197,9 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::SetRadioPubSub( CRadioPubSub* aPubSub )
- {
- iPubSub = aPubSub;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
CRadioAudioRouter& CRadioEngineImp::AudioRouter() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iAudioRouter;
}
@@ -225,6 +209,7 @@
//
CRadioSystemEventCollector& CRadioEngineImp::SystemEventCollector() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iSystemEventCollector;
}
@@ -234,24 +219,17 @@
//
CRadioSettings& CRadioEngineImp::Settings() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iSettings;
}
// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioPubSub* CRadioEngineImp::PubSub() const
- {
- return iPubSub;
- }
-
-// ---------------------------------------------------------------------------
// Determines radio region
// ---------------------------------------------------------------------------
//
TRadioRegion CRadioEngineImp::DetermineRegion()
{
+ LEVEL3( LOG_METHOD_AUTO );
TRadioRegion region = ERadioRegionNone;
MRadioEngineSettings& engineSettings = iSettings->EngineSettings();
@@ -289,15 +267,13 @@
// the radio is not functional
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::InitRadioL( TInt aRegionId, CRadioPubSub* aPubSub )
+void CRadioEngineImp::InitRadioL( TInt aRegionId )
{
LOG_METHOD_AUTO;
- LOG_FORMAT( "CRadioEngineImp::InitRadioL: Region: %d", aRegionId );
+ LOG_FORMAT( "Region: %d", aRegionId );
iRadioInitializationState = ERadioNotInitialized;
- iPubSub = aPubSub;
-
iFreqEventReason = RadioEngine::ERadioFrequencyEventReasonUnknown;
if ( iSettings->EngineSettings().RegionId() != aRegionId )
{
@@ -335,6 +311,7 @@
//
TBool CRadioEngineImp::RadioInitialized() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iRadioInitializationState == ERadioTunerControlGranted;
}
@@ -344,7 +321,8 @@
//
void CRadioEngineImp::EnableAudio( TBool aEnable, TBool aDelay )
{
- LOG_FORMAT( "CRadioEngineImp::EnableAudio( %d )", aEnable );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aEnable %d ", aEnable );
iRadioEnabled = aEnable;
if ( aDelay )
{
@@ -376,6 +354,7 @@
//
TBool CRadioEngineImp::RadioAudioEnabled() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iRadioEnabled;
}
@@ -385,7 +364,8 @@
//
void CRadioEngineImp::SetAudioOverride( TBool aOverride )
{
- LOG_FORMAT( "CRadioEngineImp::SetAudioOverride( %d )", aOverride );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aOverride %d ", aOverride ) );
iOverrideAudioResources = aOverride;
}
@@ -395,7 +375,7 @@
//
void CRadioEngineImp::AddObserverL( MRadioEngineObserver* aObserver )
{
- LOG( "CRadioEngineImp::AddObserver" );
+ LEVEL3( LOG_METHOD_AUTO );
TInt index = iObservers.FindInAddressOrder( aObserver );
if ( index == KErrNotFound )
{
@@ -409,7 +389,7 @@
//
void CRadioEngineImp::RemoveObserver( MRadioEngineObserver* aObserver )
{
- LOG( "CRadioEngineImp::RemoveObserver" );
+ LEVEL3( LOG_METHOD_AUTO );
TInt index = iObservers.FindInAddressOrder( aObserver );
if ( index >= 0 )
@@ -424,6 +404,7 @@
//
TFmRadioFrequencyRange CRadioEngineImp::TunerFrequencyRangeForRegionId( TInt aRegionId ) const
{
+ LEVEL3( LOG_METHOD_AUTO );
TFmRadioFrequencyRange result = EFmRangeEuroAmerica;
switch ( aRegionId )
{
@@ -454,7 +435,8 @@
void CRadioEngineImp::SetAudioMode( TInt aAudioMode )
{
- LOG_FORMAT( "CRadioEngineImp::SetAudioMode: aAudioMode: %d", aAudioMode );
+ LEVEL3( LOG_METHOD_AUTO );
+ LOG_FORMAT( "aAudioMode: %d", aAudioMode );
TInt err = KErrNone;
if ( !RadioInitialized() )
{
@@ -478,7 +460,8 @@
//
void CRadioEngineImp::SwitchPower( TBool aPowerOn )
{
- LOG_FORMAT( "CRadioEngineImp::SwitchPower( %d )", aPowerOn );
+ LEVEL3( LOG_METHOD_AUTO );
+ LOG_FORMAT( "aPowerOn %d", aPowerOn );
if ( RadioInitialized() )
{
if ( !aPowerOn || OkToPlay( iSettings->EngineSettings().TunedFrequency() ) )
@@ -519,7 +502,7 @@
//
TInt CRadioEngineImp::StaticPowerOnCallback( TAny* aSelfPtr )
{
- LOG( "CRadioEngineImp::StaticPowerOnCallback" );
+ LEVEL3( LOG_METHOD_AUTO );
CRadioEngineImp* self = reinterpret_cast<CRadioEngineImp*>( aSelfPtr );
if ( self )
@@ -541,7 +524,7 @@
//
TInt CRadioEngineImp::StaticPowerOffCallback( TAny* aSelfPtr )
{
- LOG( "CRadioEngineImp::StaticPowerOffCallback" );
+ LEVEL3( LOG_METHOD_AUTO );
CRadioEngineImp* self = reinterpret_cast<CRadioEngineImp*>( aSelfPtr );
if ( self )
@@ -573,17 +556,8 @@
iPlayerUtility->SetVolumeRamp( TTimeIntervalMicroSeconds( MAKE_TINT64( 0, KRadioMillion ) ) );
iPlayerUtility->SetVolume( TunerVolumeForUiVolume( iSettings->EngineSettings().Volume() ) );
- // If we are about to start scanning, mute the radio and set minimum frequency
- if ( iScanObserver )
- {
- iPlayerUtility->Mute( ETrue );
- iTunerUtility->SetFrequency( iSettings->EngineSettings().MinFrequency() );
- }
- else
- {
- iPlayerUtility->Mute( iSettings->EngineSettings().IsVolMuted() );
- iTunerUtility->SetFrequency( iSettings->EngineSettings().TunedFrequency() );
- }
+ iPlayerUtility->Mute( iSettings->EngineSettings().IsVolMuted() );
+ iTunerUtility->SetFrequency( iSettings->EngineSettings().TunedFrequency() );
iFreqEventReason = RadioEngine::ERadioFrequencyEventReasonImplicit;
TRAP_IGNORE( iAudioRouter->SetAudioRouteL(
@@ -603,7 +577,7 @@
//
void CRadioEngineImp::PowerOff()
{
- LOG( "CRadioEngineImp::PowerOff" );
+ LOG_METHOD_AUTO;
if ( iSettings->EngineSettings().IsPowerOn() )
{
@@ -624,6 +598,7 @@
//
TBool CRadioEngineImp::OkToPlay( TUint32 aFrequency ) const
{
+ LEVEL3( LOG_METHOD_AUTO );
TBool audioResourcesAvailable = iSystemEventCollector->IsAudioResourcesAvailable();
TBool okToPlay = iAntennaAttached &&
!iFmTransmitterActive &&
@@ -635,7 +610,7 @@
IsFrequencyValid( aFrequency );
#endif //COMPILE_IN_IVALO
- LOG_FORMAT( "CRadioEngineImp::OkToPlay, returning %d ", okToPlay );
+ LEVEL2( LOG_FORMAT( "returning okToPlay %d ", okToPlay ) );
return okToPlay;
}
@@ -645,6 +620,7 @@
//
TBool CRadioEngineImp::IsFrequencyValid( TUint32 aFrequency ) const
{
+ LEVEL3( LOG_METHOD_AUTO );
TBool ret( EFalse );
if ( !aFrequency )
{
@@ -658,95 +634,80 @@
}
// ---------------------------------------------------------------------------
-// Radio tuning
+//
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::SetFrequency( TUint32 aFrequency, RadioEngine::TRadioFrequencyEventReason aReason )
+void CRadioEngineImp::SetManualSeekMode( TBool aManualSeekActive )
{
- LOG_METHOD_AUTO;
- LOG_FORMAT( "CRadioEngineImp::SetFrequency, freq: %u, Initialized: %d, Enabled: %d",
- aFrequency, RadioInitialized(), iRadioEnabled );
-
- iFrequencySetByRdsAf = EFalse;
- iFreqEventReason = aReason;
-
- TInt frequency = 0;
- if ( iTunerUtility )
+ iManualSeekMode = aManualSeekActive;
+ if ( iManualSeekMode )
{
- iTunerUtility->GetFrequency( frequency );
- }
- CancelSeek();
-
- if ( aFrequency == frequency ) //radio has already the frequency to be set.
- {
- LOG( "CRadioEngineImp::SetFrequency: Already at the requested frequency" );
- HandleFrequencyEvent( aFrequency );
+ CancelSeek();
+ iRdsReceiver->StopReceiver();
}
else
{
- iRadioTimer->Cancel();
- if ( RadioInitialized() && iRadioEnabled && OkToPlay( aFrequency ) )
- {
- LOG( "CRadioEngineImp::SetFrequency: Tuning to frequency" );
- iTunerUtility->SetFrequency( aFrequency );
- }
- else
- {
- HandleFrequencyEvent( aFrequency );
- }
+ iRdsReceiver->StartReceiver();
+ TInt frequency = 0;
+ iTunerUtility->GetFrequency( frequency );
+ HandleFrequencyEvent( frequency );
}
}
// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+TBool CRadioEngineImp::IsInManualSeekMode() const
+ {
+ return iManualSeekMode;
+ }
+
+// ---------------------------------------------------------------------------
// Radio tuning
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::SetFrequencyFast( TUint32 aFrequency,
- RadioEngine::TRadioFrequencyEventReason /*aReason*/ )
-{
- if ( iSeekingState != RadioEngine::ERadioNotSeeking )
+void CRadioEngineImp::SetFrequency( TUint32 aFrequency, RadioEngine::TRadioFrequencyEventReason aReason )
{
- iSeekingState = RadioEngine::ERadioNotSeeking;
- iTunerUtility->CancelStationSeek();
- }
- iTunerUtility->SetFrequency( aFrequency );
- iSettings->RadioSetter().SetTunedFrequency( aFrequency );
-}
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL2( LOG_FORMAT( "freq: %u, Initialized: %d, Enabled: %d",
+ aFrequency, RadioInitialized(), iRadioEnabled ) );
-// ---------------------------------------------------------------------------
-// Frequency stepping
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineImp::StepToFrequency( RadioEngine::TRadioTuneDirection aDirection )
- {
- LOG( "CRadioEngineImp::StepToFrequency" );
-
- TUint32 freq = iSettings->EngineSettings().TunedFrequency();
- RadioEngine::TRadioFrequencyEventReason reason( RadioEngine::ERadioFrequencyEventReasonUnknown );
- if ( aDirection == RadioEngine::ERadioUp )
+ iFreqEventReason = aReason;
+ if ( iManualSeekMode )
{
- freq = freq + iSettings->EngineSettings().FrequencyStepSize();
- reason = RadioEngine::ERadioFrequencyEventReasonUp;
+ iTunerUtility->SetFrequency( aFrequency );
}
else
{
- freq = freq - iSettings->EngineSettings().FrequencyStepSize();
- reason = RadioEngine::ERadioFrequencyEventReasonDown;
- }
+ iFrequencySetByRdsAf = EFalse;
- // Check overflow or underflow
- if ( IsFrequencyValid( freq ) )
- {
- if ( aDirection == RadioEngine::ERadioUp )
+ TInt frequency = 0;
+ if ( iTunerUtility )
{
- freq = iSettings->EngineSettings().MinFrequency();
+ iTunerUtility->GetFrequency( frequency );
+ }
+ CancelSeek();
+
+ if ( aFrequency == frequency ) //radio has already the frequency to be set.
+ {
+ LOG( "CRadioEngineImp::SetFrequency: Already at the requested frequency" );
+ HandleFrequencyEvent( aFrequency );
}
else
{
- freq = iSettings->EngineSettings().MaxFrequency();
+ iRadioTimer->Cancel();
+ if ( RadioInitialized() && iRadioEnabled && OkToPlay( aFrequency ) )
+ {
+ LOG( "CRadioEngineImp::SetFrequency: Tuning to frequency" );
+ iTunerUtility->SetFrequency( aFrequency );
+ }
+ else
+ {
+ HandleFrequencyEvent( aFrequency );
+ }
}
}
- SetFrequency( freq, reason );
}
// ---------------------------------------------------------------------------
@@ -755,7 +716,8 @@
//
void CRadioEngineImp::Seek( RadioEngine::TRadioTuneDirection aDirection )
{
- LOG_FORMAT( "CRadioEngineImp::Seek-- Start direction:%d",aDirection );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aDirection: %d",aDirection );
iFrequencySetByRdsAf = EFalse;
@@ -798,7 +760,6 @@
else
{
NotifyRadioEvent( ERadioEventSeeking, KErrGeneral );
- StopScan( KErrGeneral );
}
}
@@ -808,22 +769,16 @@
//
void CRadioEngineImp::CancelSeek()
{
- LOG_FORMAT( "CRadioEngineImp::CancelSeek -- seeking state was:%d", iSeekingState );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "seeking state was:%d", iSeekingState );
- if ( !iScanObserver )
+ if ( iSeekingState != RadioEngine::ERadioNotSeeking )
{
- if ( iSeekingState != RadioEngine::ERadioNotSeeking )
- {
- iSeekingState = RadioEngine::ERadioNotSeeking;
- iTunerUtility->CancelStationSeek();
- iFreqEventReason = RadioEngine::ERadioFrequencyEventReasonImplicit;
- NotifyRadioEvent( ERadioEventSeeking, KErrCancel );
- NotifyRadioEvent( ERadioEventFrequency, KErrNone ); // Notify the observers even if the frequency remains the same.
- }
- }
- else
- {
- StopScan( KErrCancel );
+ iSeekingState = RadioEngine::ERadioNotSeeking;
+ iTunerUtility->CancelStationSeek();
+ iFreqEventReason = RadioEngine::ERadioFrequencyEventReasonImplicit;
+ NotifyRadioEvent( ERadioEventSeeking, KErrCancel );
+ NotifyRadioEvent( ERadioEventFrequency, KErrNone ); // Notify the observers even if the frequency remains the same.
}
}
@@ -833,84 +788,23 @@
//
RadioEngine::TRadioSeeking CRadioEngineImp::Seeking() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iSeekingState;
}
// ---------------------------------------------------------------------------
-// Starts scanning all available stations from the minimum frequency
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineImp::StartScan( MRadioScanObserver& aObserver )
- {
- LOG( "CRadioEngineImp::StartScan" );
-
- const TUint32 minFrequency = iSettings->EngineSettings().MinFrequency();
- if ( !iScanObserver && iRadioEnabled && RadioInitialized() && OkToPlay( minFrequency ) )
- {
- CancelSeek();
- iScanObserver = &aObserver;
- iPreviousMuteState = iSettings->EngineSettings().IsVolMuted();
- iPreviousScannedFrequency = 0;
- iPlayerUtility->Mute( ETrue );
- iTunerUtility->SetFrequency( minFrequency );
- Seek( RadioEngine::ERadioUp );
- }
- else
- {
- TInt error = iScanObserver ? KErrAlreadyExists : KErrNotReady;
- TRAP_IGNORE( aObserver.ScanCompletedEventL( error ) )
- }
- }
-
-// ---------------------------------------------------------------------------
-// Stops any scans currently in progress.
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineImp::StopScan( TInt aError )
- {
- LOG_FORMAT( "CRadioEngineImp::StopScan, error: %d", aError );
- if ( iScanObserver )
- {
- if ( iSeekingState != RadioEngine::ERadioNotSeeking )
- {
- iSeekingState = RadioEngine::ERadioNotSeeking;
- if ( RadioInitialized() )
- {
- iTunerUtility->CancelStationSeek();
- }
- }
-
- iPreviousScannedFrequency = 0;
- MRadioScanObserver& observer = *iScanObserver;
- iScanObserver = NULL;
- NotifyRadioScanEvent( ERadioEventScanCompleted, observer, aError );
-
- if ( !OkToPlay( iSettings->EngineSettings().MinFrequency() ) )
- {
- // Try to reset the frequency as sometimes extra frequency event occurs after seeking
- iFreqEventReason = RadioEngine::ERadioFrequencyEventReasonImplicit;
- iTunerUtility->SetFrequency( iSettings->EngineSettings().TunedFrequency() );
- }
-
- if ( iPlayerUtility && OkToPlay( iSettings->EngineSettings().TunedFrequency() ) )
- {
- iPlayerUtility->Mute( iPreviousMuteState );
- }
- }
- }
-
-// ---------------------------------------------------------------------------
// Sets volume level up/down one step.
// ---------------------------------------------------------------------------
//
void CRadioEngineImp::AdjustVolume( RadioEngine::TRadioVolumeSetDirection aDirection )
{
- LOG_FORMAT( "CRadioEngineImp::AdjustVolume( %d )", aDirection );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aDirection: %d ", aDirection );
if ( iSettings->EngineSettings().IsPowerOn() )
{
TInt volume = iSettings->EngineSettings().Volume();
- LOG_FORMAT( "CRadioEngineImp::AdjustVolume volume = ( %d )", volume );
+ LOG_FORMAT( "volume = ( %d )", volume );
if ( aDirection == RadioEngine::ERadioDecVolume )
{
@@ -931,7 +825,7 @@
}
else
{
- LOG( "CRadioEngineImp::AdjustVolume - Unhandled case" );
+ LOG( "Unhandled case" );
}
SetVolume( volume );
}
@@ -943,11 +837,12 @@
//
void CRadioEngineImp::SetVolume( TInt aVolume )
{
- LOG_FORMAT( "CRadioEngineImp::SetVolume vol: %d", aVolume );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aVolume: %d", aVolume );
if ( iSettings->EngineSettings().IsPowerOn() && RadioInitialized() )
{
- LOG( "CRadioEngineImp::SetVolume: Setting volume to player utility" );
+ LOG( "Setting volume to player utility" );
if ( aVolume == 0 )
{
@@ -972,7 +867,7 @@
// Set radio audio muted/unmuted
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::SetVolumeMuted( TBool aMuteState )
+void CRadioEngineImp::SetVolumeMuted( TBool aMuteState, TBool aUpdateSettings )
{
LOG_METHOD_AUTO;
LOG_FORMAT( "MuteState = %d", aMuteState );
@@ -983,14 +878,13 @@
if ( RadioInitialized() )
{
err = iPlayerUtility->Mute( aMuteState );
- iSettings->RadioSetter().SetVolMuted( aMuteState );
- NotifyRadioEvent( ERadioEventMute, err );
}
- else
+
+ if ( aUpdateSettings )
{
err = iSettings->RadioSetter().SetVolMuted( aMuteState );
- NotifyRadioEvent( ERadioEventMute, err );
}
+ NotifyRadioEvent( ERadioEventMute, err );
}
}
@@ -1000,7 +894,8 @@
//
TBool CRadioEngineImp::IsAntennaAttached()
{
- LOG_FORMAT( "CRadioEngineImp::IsAntennaAttached, returning %d", iAntennaAttached );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "returning iAntennaAttached: %d", iAntennaAttached ) );
return iAntennaAttached;
}
@@ -1010,7 +905,8 @@
//
TBool CRadioEngineImp::IsFmTransmitterActive() const
{
- LOG_FORMAT( "CRadioEngineImp::IsFmTransmitterActive, returning %d", iFmTransmitterActive );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "returning iFmTransmitterActive: %d", iFmTransmitterActive ) );
return iFmTransmitterActive;
}
@@ -1020,6 +916,7 @@
//
void CRadioEngineImp::SetAntennaAttached( TBool aAntennaAttached )
{
+ LOG_METHOD_AUTO;
#ifdef __WINS__
MrftoAntennaStatusChange( aAntennaAttached );
#endif
@@ -1034,6 +931,7 @@
//
TInt CRadioEngineImp::MaxVolumeLevel() const
{
+ LEVEL3( LOG_METHOD_AUTO );
TInt maxLevel = 0;
#if defined __WINS__
@@ -1059,6 +957,7 @@
//
TBool CRadioEngineImp::FrequencySetByRdsAf() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iFrequencySetByRdsAf;
}
@@ -1068,6 +967,7 @@
//
MRadioRdsReceiver& CRadioEngineImp::RdsReceiver()
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iRdsReceiver;
}
@@ -1077,6 +977,7 @@
//
TInt CRadioEngineImp::TunerVolumeForUiVolume( TInt aUiVolume )
{
+ LEVEL3( LOG_METHOD_AUTO );
TInt vol = aUiVolume * KRadioVolumeStepsDivider;
return vol;
@@ -1088,6 +989,7 @@
//
void CRadioEngineImp::NotifyRadioEvent( TInt aRadioEvent, TInt aErrorCode )
{
+ LEVEL3( LOG_METHOD_AUTO );
TRAP_IGNORE( DoNotifyRadioEventL( aRadioEvent, aErrorCode ) )
}
@@ -1098,6 +1000,7 @@
//
void CRadioEngineImp::DoNotifyRadioEventL( TInt aRadioEvent, TInt aErrorCode )
{
+ LOG_METHOD_AUTO;
TInt count = iObservers.Count();
for ( TInt i = 0; i<count; i++)
@@ -1124,10 +1027,7 @@
}
case ERadioEventMute:
{
- if ( !iScanObserver )
- {
- observer->MuteEventL( iSettings->EngineSettings().IsVolMuted(), aErrorCode );
- }
+ observer->MuteEventL( iSettings->EngineSettings().IsVolMuted(), aErrorCode );
break;
}
case ERadioEventAudioMode:
@@ -1169,52 +1069,13 @@
}
// ---------------------------------------------------------------------------
-// Notifies the observer of a radio scan event.
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineImp::NotifyRadioScanEvent( TRadioScanEvent aEvent,
- MRadioScanObserver& aObserver,
- TInt aError )
- {
- TRAP_IGNORE( DoNotifyRadioScanEventL( aEvent, aObserver, aError ) )
- }
-
-// ---------------------------------------------------------------------------
-// Notifies the observer of a radio scan event.
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineImp::DoNotifyRadioScanEventL( TRadioScanEvent aEvent,
- MRadioScanObserver& aObserver,
- TInt aError )
- {
- LOG_FORMAT( "CRadioEngineImp::DoNotifyRadioScanEventL, aEvent: %d, aError: %d", aEvent, aError );
-
- if ( aEvent == ERadioEventFrequencyScanned )
- {
- if ( aError == KErrNone )
- {
- aObserver.ScanFrequencyEventL( iPreviousScannedFrequency );
- }
- }
- else if ( aEvent == ERadioEventScanCompleted )
- {
- // KFmRadioErrTuning error means that no channels can be found anymore
- if ( aError == KFmRadioErrTuning )
- {
- aError = KErrNotFound;
- }
-
- aObserver.ScanCompletedEventL( aError );
- }
- }
-
-// ---------------------------------------------------------------------------
// Handles some system events
// ---------------------------------------------------------------------------
//
void CRadioEngineImp::HandleSystemEventL( TRadioSystemEventType aEventType )
{
- LOG_FORMAT( "CRadioEngineImp::HandleSystemEventL, aEventType = %d", aEventType );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aEventType = %d", aEventType );
switch ( aEventType )
{
@@ -1245,7 +1106,6 @@
case ERadioCallActivated:
{
- StopScan( KErrGeneral );
CancelSeek();
}
break;
@@ -1260,6 +1120,8 @@
{
// Explicitly set the audio routing to headset. Because system
// forces the routing to headset anyway, and without our knowledge.
+ MRadioSettingsSetter& setter = iSettings->RadioSetter();
+ setter.SetAudioRoute( RadioEngine::ERadioHeadset );
iAudioRouter->SetAudioRouteL( RadioEngine::ERadioHeadset );
}
break;
@@ -1268,6 +1130,8 @@
{
// Explicitly set the audio routing to speaker. Because system
// forces the routing to speaker anyway, if radio stays on.
+ MRadioSettingsSetter& setter = iSettings->RadioSetter();
+ setter.SetAudioRoute( RadioEngine::ERadioSpeaker );
iAudioRouter->SetAudioRouteL( RadioEngine::ERadioSpeaker );
}
break;
@@ -1284,7 +1148,8 @@
//
void CRadioEngineImp::MrftoRequestTunerControlComplete( TInt aError )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoRequestTunerControlComplete( %d )", aError );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aError: %d", aError );
if ( aError == KErrNone || aError == KErrAlreadyExists ) // Tuner activated now or was already active
{
@@ -1319,13 +1184,9 @@
TFmTunerCapabilities::ETunerAvailableInOfflineMode );
iTunerUtility->EnableTunerInOfflineMode( offlineAvailable );
- TBool rdsSupported = EFalse;
- TRAP_IGNORE( CRadioRepositoryManager::GetRepositoryValueL( KRadioCRUid, KRadioCRRdsSupport,
- rdsSupported ) )
- if ( tunerCaps.iTunerFunctions & TFmTunerCapabilities::ETunerRdsSupport &&
- rdsSupported )
+ if ( tunerCaps.iTunerFunctions & TFmTunerCapabilities::ETunerRdsSupport )
{
- TRAP_IGNORE( iRdsReceiver->InitL( *iRadioUtility, iPubSub ) )
+ TRAP_IGNORE( iRdsReceiver->InitL( *iRadioUtility ) )
}
iTunerUtility->SetFrequencyRange( TunerFrequencyRangeForRegionId(
@@ -1342,7 +1203,8 @@
//
void CRadioEngineImp::MrftoSetFrequencyRangeComplete( TInt aError )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoSetFrequencyRangeComplete( %d )", aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d", aError ) );
if ( aError )
{
NotifyRadioEvent( ERadioEventRegion, aError );
@@ -1355,9 +1217,10 @@
//
void CRadioEngineImp::MrftoSetFrequencyComplete( TInt aError )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoSetFrequencyComplete: Err: %d", aError );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aError: %d", aError );
- if ( aError )
+ if ( aError && !iManualSeekMode )
{
if ( aError == KErrNotReady )
{
@@ -1373,7 +1236,8 @@
//
void CRadioEngineImp::MrftoStationSeekComplete( TInt aError, TInt aFrequency )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoStationSeekComplete() -- aError = %d, aFrequency = %d", aError, aFrequency );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aError = %d, aFrequency = %d", aError, aFrequency );
// Seeking has ended, error code tells if it was successful
if ( aError == KFmRadioErrAntennaNotConnected )
@@ -1387,7 +1251,9 @@
iSeekingState = RadioEngine::ERadioNotSeeking;
- NotifyRadioEvent( ERadioEventSeeking, aError );
+ if ( aFrequency == 0 ) {
+ NotifyRadioEvent( ERadioEventFrequency, aError );
+ }
// if ( aError != KErrNone )
// {
@@ -1402,32 +1268,6 @@
// NotifyRadioEvent( ERadioEventFrequency, KErrNone );
// }
// }
-
- if ( iScanObserver )
- {
- if ( aError != KErrNone )
- {
- StopScan( aError );
- }
- else
- {
- if ( aFrequency > iSettings->EngineSettings().MinFrequency() && aFrequency > iPreviousScannedFrequency )
- {
- iPreviousScannedFrequency = aFrequency;
- NotifyRadioScanEvent( ERadioEventFrequencyScanned, *iScanObserver, KErrNone );
- Seek( RadioEngine::ERadioUp ); // Continue scanning.
- }
- else
- {
- if ( aFrequency == iSettings->EngineSettings().MinFrequency() )
- {
- iPreviousScannedFrequency = aFrequency;
- NotifyRadioScanEvent( ERadioEventFrequencyScanned, *iScanObserver, KErrNone );
- }
- StopScan( aError );
- }
- }
- }
}
// ---------------------------------------------------------------------------
@@ -1436,7 +1276,8 @@
//
void CRadioEngineImp::MrftoFmTransmitterStatusChange( TBool aActive )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoFmTransmitterStatusChange( %d )", aActive );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aActive: %d", aActive );
iFmTransmitterActive = aActive;
if ( !iFmTransmitterActive )
@@ -1453,18 +1294,17 @@
//
void CRadioEngineImp::MrftoAntennaStatusChange( TBool aAttached )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoAntennaStatusChange( %d )", aAttached );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aAttached: %d", aAttached );
iAntennaAttached = aAttached;
if ( iAntennaAttached )
{
SwitchPower( ETrue );
NotifyRadioEvent( ERadioEventAntenna );
- iPubSub->PublishAntennaState( ERadioPSRadioAntennaAttached );
}
else
{
NotifyRadioEvent( ERadioEventAntenna, KErrDisconnected );
- iPubSub->PublishAntennaState( ERadioPSRadioAntennaDetached );
}
}
@@ -1473,18 +1313,20 @@
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::MrftoOfflineModeStatusChange( TBool DEBUGVAR( aOfflineMode ) )
+void CRadioEngineImp::MrftoOfflineModeStatusChange( TBool DEBUGVAR3( aOfflineMode ) )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoOfflineModeStatusChange( %d )", aOfflineMode );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aOfflineMode: %d", aOfflineMode ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::MrftoFrequencyRangeChange( TFmRadioFrequencyRange DEBUGVAR( aBand ) )
+void CRadioEngineImp::MrftoFrequencyRangeChange( TFmRadioFrequencyRange DEBUGVAR3( aBand ) )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoFrequencyRangeChange( %d )", aBand );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aBand: %d", aBand ) );
if ( RadioInitialized() )
{
iTunerUtility->SetFrequency( iSettings->EngineSettings().TunedFrequency() );
@@ -1499,13 +1341,13 @@
//
void CRadioEngineImp::MrftoFrequencyChange( TInt aNewFrequency )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoFrequencyChange aNewFrequency = %u", aNewFrequency );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aNewFrequency = %u", aNewFrequency ) );
// There may be frequency changed events when radio is not initialized ( because
// of SetFrequency or Seek returns with KErrNotReady ).
- if ( RadioInitialized() )
+ if ( !iManualSeekMode && RadioInitialized() )
{
-
HandleFrequencyEvent( aNewFrequency );
}
}
@@ -1516,7 +1358,8 @@
//
void CRadioEngineImp::MrftoForcedMonoChange( TBool aForcedMono )
{
- LOG_FORMAT( "CRadioEngineImp::MrftoForcedMonoChange -- aForcedMono = %d", aForcedMono );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aForcedMono = %d", aForcedMono ) );
iSettings->RadioSetter().SetOutputMode( aForcedMono ? RadioEngine::ERadioMono : RadioEngine::ERadioStereo );
NotifyRadioEvent( ERadioEventAudioMode );
@@ -1528,6 +1371,7 @@
//
void CRadioEngineImp::MrftoSquelchChange( TBool /*aSquelch*/ )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -1536,7 +1380,8 @@
//
void CRadioEngineImp::MrpoStateChange( TPlayerState aState, TInt aError )
{
- LOG_FORMAT( "CRadioEngineImp::MrpoStateChange() -- aState = %d, aError = %d", aState, aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aState = %d, aError = %d", aState, aError ) );
if ( aError == KFmRadioErrAntennaNotConnected )
{
@@ -1551,8 +1396,8 @@
//
void CRadioEngineImp::MrpoVolumeChange( TInt aVolume )
{
- aVolume = aVolume / KRadioVolumeStepsDivider;
- LOG_FORMAT( "CRadioEngineImp::MrpoVolumeChange() -- volume = %d", aVolume );
+ LEVEL3( LOG_METHOD_AUTO );
+ aVolume = aVolume / KRadioVolumeStepsDivider;
if ( aVolume != iSettings->EngineSettings().Volume() )
{
iSettings->RadioSetter().SetVolume( aVolume );
@@ -1566,8 +1411,9 @@
//
void CRadioEngineImp::MrpoMuteChange( TBool aMute )
{
+ LEVEL3( LOG_METHOD_AUTO );
TBool muted = iSettings->EngineSettings().IsVolMuted();
- if ( !iScanObserver && !aMute != !muted )
+ if ( !aMute != !muted )
{
iSettings->RadioSetter().SetVolMuted( aMute );
NotifyRadioEvent( ERadioEventMute );
@@ -1580,6 +1426,7 @@
//
void CRadioEngineImp::MrpoBalanceChange( TInt /*aLeftPercentage*/, TInt /*aRightPercentage*/ )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -1588,7 +1435,8 @@
//
void CRadioEngineImp::RdsAfSearchSettingChangedL( TBool aEnabled )
{
- LOG_FORMAT( "CRadioEngineImp::RdsAfSearchSettingChangedL( %d )", aEnabled );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aEnabled: %d", aEnabled ) );
iRdsReceiver->SetAutomaticSwitchingL( aEnabled );
}
@@ -1596,9 +1444,11 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::RegionSettingChangedL( TInt DEBUGVAR( aRegion ) )
+//TODO: Check if this can be removed. Radio doesn't currently support changing regions on the fly
+void CRadioEngineImp::RegionSettingChangedL( TInt DEBUGVAR3( aRegion ) )
{
- LOG_FORMAT( "CRadioEngineImp::RegionSettingChangedL( %d )", aRegion );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aRegion: %d", aRegion ) );
if ( RadioInitialized() )
{
@@ -1614,7 +1464,7 @@
//
void CRadioEngineImp::RdsAfSearchBegin()
{
- LOG( "CRadioEngineImp::RdsAfSearchBegin()" );
+ LEVEL3( LOG_METHOD_AUTO );
iFrequencySetByRdsAf = ETrue;
}
@@ -1622,9 +1472,10 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioEngineImp::RdsAfSearchEnd( TUint32 DEBUGVAR( aFrequency ), TInt aError )
+void CRadioEngineImp::RdsAfSearchEnd( TUint32 DEBUGVAR3( aFrequency ), TInt aError )
{
- LOG_FORMAT( "CRadioEngineImp::RdsAfSearchEnd( %d, %d )", aFrequency, aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aFrequency: %d, aError: %d )", aFrequency, aError ) );
if ( aError != KErrNone )
{
iFrequencySetByRdsAf = EFalse;
@@ -1637,11 +1488,12 @@
//
TRadioRegion CRadioEngineImp::RegionFromMobileNetwork() const
{
+ LEVEL3( LOG_METHOD_AUTO );
TRadioRegion region = ERadioRegionNone;
// Choose the frequency range according to country code
MRadioEngineSettings& engineSettings = iSettings->EngineSettings();
- const TDesC& countryCode = engineSettings.CountryCode();
+ TPtrC countryCode = engineSettings.CountryCode();
const TInt regionCount = engineSettings.CountRegions();
TBool matchFound = EFalse;
for ( TInt i = 0; i < regionCount && !matchFound; ++i )
@@ -1670,6 +1522,7 @@
//
TRadioRegion CRadioEngineImp::RegionFromTimezone() const
{
+ LEVEL3( LOG_METHOD_AUTO );
TRadioRegion region = ERadioRegionNone;
TRAP_IGNORE( region = DoRegionFromTimezoneL() );
return region;
@@ -1694,7 +1547,7 @@
const TUint8 cityId = city->GroupId();
delete city;
city = NULL;
- LOG_FORMAT( "CRadioEngineHandler::CurrentTimeZoneToRegionL group id: %d", cityId );
+ LOG_FORMAT( "group id: %d", cityId );
TRadioRegion region = ERadioRegionNone;
const TInt cityGroupCount = cityGroups->Count();
@@ -1711,7 +1564,7 @@
CleanupStack::PopAndDestroy( cityGroups );
CleanupStack::PopAndDestroy( timezoneLocalizer );
- LOG_ASSERT( found, LOG_FORMAT( "CRadioEngine::DoMapCurrentTimeZoneToRegionL. City not found: %d", cityId ) );
+ LOG_ASSERT( found, LOG_FORMAT( "City not found: %d", cityId ) );
return region;
}
@@ -1722,7 +1575,8 @@
//
void CRadioEngineImp::HandleAudioRoutingEvent( RadioEngine::TRadioAudioRoute aDestination )
{
- LOG_FORMAT( "CRadioEngineImp::HandleAudioRoutingL( %d )", aDestination );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aDestination: %d", aDestination );
// Make modifications to volume ONLY if new audio source state
// differs from settings. If they don't differ, this state
@@ -1766,7 +1620,8 @@
//
void CRadioEngineImp::HandlePowerEvent( TBool aPowerOn, TInt aErrorCode )
{
- LOG_FORMAT( "CRadioEngineImp::HandlePowerEvent( %d, %d )", aPowerOn, aErrorCode );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aPowerOn: %d, aErrorCode: %d )", aPowerOn, aErrorCode );
const TBool powerState = iSettings->EngineSettings().IsPowerOn();
if ( !powerState != !aPowerOn )
@@ -1785,7 +1640,6 @@
if ( !iSettings->EngineSettings().IsPowerOn() )
{
- StopScan( aErrorCode );
CancelSeek();
}
@@ -1810,7 +1664,8 @@
//
void CRadioEngineImp::HandleFrequencyEvent( TUint32 aFrequency, TInt aErrorCode )
{
- LOG_FORMAT( "CRadioEngineImp::HandleFrequencyEvent( %d, %d )", aFrequency, aErrorCode );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aFrequency: %d, aErrorCode: %d )", aFrequency, aErrorCode );
if ( iSettings->EngineSettings().TunedFrequency() != aFrequency )
{
@@ -1857,6 +1712,7 @@
//
TBool CRadioEngineImp::IsAudioRoutingPossible() const
{
+ LEVEL3( LOG_METHOD_AUTO );
TBool headsetConnected = EFalse;
TRAP_IGNORE( ( headsetConnected = iSystemEventCollector->IsHeadsetConnectedL() ) )
--- a/radioengine/engine/src/cradionetworkinfolistener.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/src/cradionetworkinfolistener.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -36,6 +36,7 @@
CRadioNetworkInfoListener* CRadioNetworkInfoListener::NewL( MRadioSettingsSetter& aSetter,
MRadioNetworkChangeObserver* aObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioNetworkInfoListener* self = new ( ELeave ) CRadioNetworkInfoListener( aSetter, aObserver );
CleanupStack::PushL( self );
self->ConstructL();
@@ -55,6 +56,7 @@
, iSubscriberIdPckg( iSubscriberId )
, iNetworkInfoPckg( iNetworkInfo )
{
+ LEVEL3( LOG_METHOD_AUTO );
CActiveScheduler::Add( this );
}
@@ -170,27 +172,6 @@
User::Leave( KErrNotSupported );
}
- if ( identityCaps & RMobilePhone::KCapsGetSubscriberId )
- {
- TRequestStatus stat;
- RMobilePhone::TMobilePhoneSubscriberId subscriberId;
- mobilePhone.GetSubscriberId( stat, subscriberId );
- User::WaitForRequest( stat );
-
- CTelephony::TSubscriberIdV1 telephonySubscriberId;
-
- if ( stat == KErrNone )
- {
- telephonySubscriberId.iSubscriberId = subscriberId;
- }
- else
- {
- telephonySubscriberId.iSubscriberId = iSetter.SubscriberId();
- }
-
- iSubscriberIdPckg() = telephonySubscriberId;
- }
-
CleanupStack::PopAndDestroy( 2, &telServer );
#endif
// At the end, update the local variables by simulating the "netid changed" event.
@@ -203,6 +184,7 @@
//
CRadioNetworkInfoListener::~CRadioNetworkInfoListener()
{
+ LEVEL3( LOG_METHOD_AUTO );
Cancel();
#ifndef __WINS__
@@ -216,7 +198,8 @@
//
TInt CRadioNetworkInfoListener::CompoundNetworkId() const
{
- LOG_FORMAT( "CRadioNetworkInfoListener::CompoundNetworkId() - %d", iCompoundNetworkId );
+ LEVEL3( LOG_METHOD_AUTO );
+ LOG_FORMAT( "Returning iCompoundNetworkId: %d", iCompoundNetworkId );
return iCompoundNetworkId;
}
@@ -226,8 +209,9 @@
//
TPtrC CRadioNetworkInfoListener::SubscriberId() const
{
+ LEVEL3( LOG_METHOD_AUTO );
TPtrC id = iSubscriberId.iSubscriberId;
- LOG_FORMAT( "CRadioNetworkInfoListener::SubscriberId() - %S", &id );
+ LOG_FORMAT( "SubscriberId: %S", &id );
return id;
}
@@ -237,8 +221,9 @@
//
TPtrC CRadioNetworkInfoListener::CountryCode() const
{
+ LEVEL3( LOG_METHOD_AUTO );
TPtrC countryCode = iSetter.CountryCode();
- LOG_FORMAT( "CRadioNetworkInfoListener::CountryCode() - %S", &countryCode );
+ LOG_FORMAT( "CountryCode: %S", &countryCode );
return countryCode;
}
@@ -248,12 +233,13 @@
//
void CRadioNetworkInfoListener::SaveNetworkInfoL()
{
+ LEVEL3( LOG_METHOD_AUTO );
#ifdef __WINS__
iNetworkInfo.iCountryCode.Copy( _L("244") );
iNetworkInfo.iNetworkId.Zero();
#endif
- LOG_FORMAT( "CRadioNetworkInfoListener::SaveNetworkInfoL() - iNetworkInfo.iCountryCode = %S",
+ LOG_FORMAT( "iNetworkInfo.iCountryCode = %S",
&iNetworkInfo.iCountryCode );
User::LeaveIfError( iSetter.SetCountryCode( iNetworkInfo.iCountryCode ) );
@@ -288,6 +274,7 @@
//
void CRadioNetworkInfoListener::DoCancel()
{
+ LEVEL3( LOG_METHOD_AUTO );
#ifndef __WINS__
iTelephony->CancelAsync( CTelephony::ECurrentNetworkInfoChangeCancel );
#endif
@@ -299,7 +286,8 @@
//
void CRadioNetworkInfoListener::RunL()
{
- LOG_FORMAT( "CRadioNetworkInfoListener::RunL() - iStatus.Int() = %d", iStatus.Int() );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "iStatus.Int() = %d", iStatus.Int() ) );
#ifndef __WINS__
iTelephony->NotifyChange( iStatus, CTelephony::ECurrentNetworkInfoChange, iNetworkInfoPckg );
SetActive();
--- a/radioengine/engine/src/cradiordsreceiver.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/src/cradiordsreceiver.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -30,6 +30,7 @@
CRadioRdsReceiver::CRadioRdsReceiver( MRadioEngineSettings& aSettings )
: CRadioRdsReceiverBase( aSettings )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -38,6 +39,7 @@
//
void CRadioRdsReceiver::ConstructL()
{
+ LEVEL3( LOG_METHOD_AUTO );
BaseConstructL();
}
@@ -47,6 +49,7 @@
//
CRadioRdsReceiver* CRadioRdsReceiver::NewL( MRadioEngineSettings& aSettings )
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioRdsReceiver* self = new ( ELeave ) CRadioRdsReceiver( aSettings );
CleanupStack::PushL( self );
self->ConstructL();
@@ -60,6 +63,7 @@
//
CRadioRdsReceiver::~CRadioRdsReceiver()
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( iRdsUtility )
{
iRdsUtility->Close();
@@ -70,16 +74,15 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiver::InitL( CRadioUtility& aRadioUtility, CRadioPubSub* aPubSub )
+void CRadioRdsReceiver::InitL( CRadioUtility& aRadioUtility )
{
LOG_METHOD_AUTO;
- iPubSub = aPubSub;
iRdsUtility = &aRadioUtility.RadioRdsUtilityL( *this );
LogReceiverCapabilities();
- SetAutomaticSwitchingL( iSettings.RdsAfSearchEnabled() );
+ SetAutomaticSwitchingL( EFalse );
}
// ---------------------------------------------------------------------------
@@ -88,6 +91,7 @@
//
void CRadioRdsReceiver::SetAutomaticSwitchingL( TBool aEnable )
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( iRdsUtility )
{
User::LeaveIfError( iRdsUtility->SetAutomaticSwitching( aEnable ) );
@@ -103,6 +107,7 @@
//
void CRadioRdsReceiver::StartReceiver()
{
+ LOG_METHOD_AUTO;
// Request to be notified of almost all RDS data.
// Unwanted RDS values:
// ERdsClockTime
@@ -119,7 +124,7 @@
rdsData.iAdditionalFunctions1 = 0;
rdsData.iAdditionalFunctions2 = 0;
- LOG_ASSERT( iRdsUtility, LOG( "CRadioRdsReceiver::StartReceiverL. Error: RDS utility not created!" ) );
+ LOG_ASSERT( iRdsUtility, LOG( "Error: RDS utility not created!" ) );
if ( iRdsUtility && !iStarted )
{
TInt err = iRdsUtility->NotifyRdsDataChange( rdsData );
@@ -127,11 +132,11 @@
{
// Avoid further calls
iStarted = ETrue;
- LOG( "CRadioRdsReceiver::StartReceiverL: Requested RDS notifications from receiver." );
+ LOG( "Requested RDS notifications from receiver." );
}
else
{
- LOG_FORMAT( "CRadioRdsReceiver::StartReceiverL. Failed to request RDS data with err %d", err );
+ LOG_FORMAT( "Failed to request RDS data with err %d", err );
}
}
}
@@ -142,7 +147,7 @@
//
void CRadioRdsReceiver::StopReceiver()
{
- LOG( "CRadioRdsReceiver::StopReceiver" );
+ LOG_METHOD_AUTO;
if ( iRdsUtility )
{
@@ -157,6 +162,7 @@
//
void CRadioRdsReceiver::LogReceiverCapabilities()
{
+ LEVEL3( LOG_METHOD_AUTO );
#ifdef LOGGING_ENABLED
// Log the RDS utility capabilities
if ( iRdsUtility )
@@ -205,13 +211,13 @@
{
capsBuf.Append( _L("TrafficAnnouncement ") );
}
- LOG_FORMAT( "CRadioRdsReceiver::LogReceiverCapabilities. RDS receiver capabilities: %S", &capsBuf );
- LOG_FORMAT( "CRadioRdsReceiver::LogReceiverCapabilities. Functions: %d, AdditionalFunctions1: %d, iAdditionalFunctions2: %d",
+ LOG_FORMAT( "RDS receiver capabilities: %S", &capsBuf );
+ LOG_FORMAT( "Functions: %d, AdditionalFunctions1: %d, iAdditionalFunctions2: %d",
caps.iRdsFunctions, caps.iAdditionalFunctions1, caps.iAdditionalFunctions2 );
}
else
{
- LOG_FORMAT( "CRadioRdsReceiver::LogReceiverCapabilities: Failed to get RDS utility capabilities: err %d", err );
+ LOG_FORMAT( "Failed to get RDS utility capabilities: err %d", err );
}
}
#endif // LOGGING_ENABLED
--- a/radioengine/engine/src/cradiordsreceiverbase.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/engine/src/cradiordsreceiverbase.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -16,7 +16,6 @@
*/
// User includes
-#include "cradiopubsub.h"
#include "cradiordsreceiverbase.h"
#include "cradioenginelogger.h"
@@ -29,6 +28,7 @@
CRadioRdsReceiverBase::CRadioRdsReceiverBase( MRadioEngineSettings& aSettings )
: iSettings( aSettings )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -37,6 +37,7 @@
//
void CRadioRdsReceiverBase::BaseConstructL()
{
+ LEVEL3( LOG_METHOD_AUTO );
iPsName = HBufC::NewL( TRdsPSName().MaxLength() );
}
@@ -46,6 +47,7 @@
//
CRadioRdsReceiverBase::~CRadioRdsReceiverBase()
{
+ LEVEL3( LOG_METHOD_AUTO );
iObservers.Close();
delete iPsName;
iRadioText.Close();
@@ -57,6 +59,7 @@
//
void CRadioRdsReceiverBase::AddObserverL( MRadioRdsDataObserver* aObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
TInt index = iObservers.FindInAddressOrder( aObserver );
if ( index == KErrNotFound )
{
@@ -70,6 +73,7 @@
//
void CRadioRdsReceiverBase::RemoveObserver( MRadioRdsDataObserver* aObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
TInt index = iObservers.FindInAddressOrder( aObserver );
if ( index >= 0 )
@@ -84,6 +88,7 @@
//
TBool CRadioRdsReceiverBase::AutomaticSwitchingEnabled() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iAfEnabled;
}
@@ -93,6 +98,7 @@
//
const TDesC& CRadioRdsReceiverBase::ProgrammeService() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iPsName;
}
@@ -102,6 +108,7 @@
//
const TDesC& CRadioRdsReceiverBase::RadioText() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iRadioText;
}
@@ -111,6 +118,7 @@
//
TBool CRadioRdsReceiverBase::SignalAvailable() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iSignalAvailable;
}
@@ -120,6 +128,7 @@
//
void CRadioRdsReceiverBase::SetAutomaticSwitchingL( TBool aEnable )
{
+ LEVEL3( LOG_METHOD_AUTO );
iAfEnabled = aEnable;
for ( TInt i = 0 ; i < iObservers.Count(); i++ )
{
@@ -133,14 +142,9 @@
//
void CRadioRdsReceiverBase::ClearRdsInformation()
{
+ LEVEL3( LOG_METHOD_AUTO );
iPsName->Des().Zero();
iRadioText.Close();
-
- if ( iPubSub )
- {
- iPubSub->PublishRdsProgramService( *iPsName );
- }
-
MrroRdsEventSignalChange( EFalse );
}
@@ -148,70 +152,77 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroStationSeekByPTYComplete( TInt DEBUGVAR( aError ),
- TInt DEBUGVAR( aFrequency ) )
+void CRadioRdsReceiverBase::MrroStationSeekByPTYComplete( TInt DEBUGVAR3( aError ),
+ TInt DEBUGVAR3( aFrequency ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroStationSeekByPTYComplete: err: %d, frequency: %d ", aError, aFrequency );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d, aFrequency: %d ", aError, aFrequency ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroStationSeekByTAComplete( TInt DEBUGVAR( aError ),
- TInt DEBUGVAR( aFrequency ) )
+void CRadioRdsReceiverBase::MrroStationSeekByTAComplete( TInt DEBUGVAR3( aError ),
+ TInt DEBUGVAR3( aFrequency ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroStationSeekByTAComplete: err: %d, frequency: %d ", aError, aFrequency );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d, aFrequency: %d ", aError, aFrequency ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroStationSeekByTPComplete( TInt DEBUGVAR( aError ),
- TInt DEBUGVAR( aFrequency ) )
+void CRadioRdsReceiverBase::MrroStationSeekByTPComplete( TInt DEBUGVAR3( aError ),
+ TInt DEBUGVAR3( aFrequency ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroStationSeekByTPComplete: err: %d, frequency: %d ", aError, aFrequency );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d, aFrequency: %d ", aError, aFrequency ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroGetFreqByPTYComplete( TInt DEBUGVAR( aError ),
+void CRadioRdsReceiverBase::MrroGetFreqByPTYComplete( TInt DEBUGVAR3( aError ),
RArray<TInt>& /*aFreqList*/ )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroGetFreqByPTYComplete: err: %d", aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d", aError ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroGetFreqByTAComplete( TInt DEBUGVAR( aError ),
+void CRadioRdsReceiverBase::MrroGetFreqByTAComplete( TInt DEBUGVAR3( aError ),
RArray<TInt>& /*aFreqList*/ )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroGetFreqByTAComplete: err: %d", aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d", aError ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroGetPSByPTYComplete( TInt DEBUGVAR( aError ),
+void CRadioRdsReceiverBase::MrroGetPSByPTYComplete( TInt DEBUGVAR3( aError ),
RArray<TRdsPSName>& /*aPsList*/ )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroGetPSByPTYComplete: err: %d", aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d", aError ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroGetPSByTAComplete( TInt DEBUGVAR( aError ),
+void CRadioRdsReceiverBase::MrroGetPSByTAComplete( TInt DEBUGVAR3( aError ),
RArray<TRdsPSName>& /*aPsList*/ )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroGetPSByTAComplete: err: %d", aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d", aError ) );
}
// ---------------------------------------------------------------------------
@@ -220,7 +231,8 @@
//
void CRadioRdsReceiverBase::MrroRdsDataPI( TInt aPi )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsDataPI: PI: %d", aPi );
+ LEVEL2( LOG_METHOD_AUTO );
+ LEVEL2( LOG_FORMAT( "aPi: %d", aPi ) );
const TInt observerCount = iObservers.Count();
const TUint32 frequency = iSettings.TunedFrequency();
for ( TInt i = 0; i < observerCount; ++i )
@@ -235,7 +247,8 @@
//
void CRadioRdsReceiverBase::MrroRdsDataPTY( TRdsProgrammeType aPty )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsDataPTY: PTY: %d", aPty );
+ LEVEL2( LOG_METHOD_AUTO );
+ LEVEL2( LOG_FORMAT( "aPty: %d", aPty ) );
const TInt observerCount = iObservers.Count();
const TUint32 frequency = iSettings.TunedFrequency();
for ( TInt i = 0; i < observerCount; ++i )
@@ -250,13 +263,9 @@
//
void CRadioRdsReceiverBase::MrroRdsDataPS( TRdsPSName& aPs )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsDataPS: PS: %S", &aPs );
+ LEVEL2( LOG_METHOD_AUTO );
+ LEVEL2( LOG_FORMAT( "aPs: %S", &aPs ) );
const TUint32 frequency = iSettings.TunedFrequency();
- if ( iPubSub )
- {
- iPubSub->PublishRdsProgramService( aPs );
- }
-
iPsName->Des().Copy( aPs );
const TInt observerCount = iObservers.Count();
for ( TInt i = 0; i < observerCount; ++i )
@@ -271,16 +280,12 @@
//
void CRadioRdsReceiverBase::MrroRdsDataRT( TRdsRadioText& aRt )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsDataRT: RT: %S", &aRt );
+ LEVEL2( LOG_METHOD_AUTO );
+ LEVEL2( LOG_FORMAT( "aRt: %S", &aRt ) );
iRadioText.Close();
iRadioText.Create( aRt );
const TUint32 frequency = iSettings.TunedFrequency();
- if ( iPubSub )
- {
- iPubSub->PublishRdsRadioText( iRadioText );
- }
-
const TInt observerCount = iObservers.Count();
for ( TInt i = 0; i < observerCount; ++i )
{
@@ -294,16 +299,17 @@
//
void CRadioRdsReceiverBase::MrroRdsDataCT( TDateTime& /*aCt*/ )
{
- LOG( "CRadioRdsReceiverBase::MrroRdsDataCT" );
+ LEVEL2( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroRdsDataTA( TBool DEBUGVAR( aTaOn ) )
+void CRadioRdsReceiverBase::MrroRdsDataTA( TBool DEBUGVAR2( aTaOn ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsDataTA: aTaOn: %d", aTaOn );
+ LEVEL2( LOG_METHOD_AUTO );
+ LEVEL2( LOG_FORMAT( "aTaOn: %d", aTaOn ) );
}
// ---------------------------------------------------------------------------
@@ -313,7 +319,8 @@
void CRadioRdsReceiverBase::MrroRdsDataRTplus( TRdsRTplusClass aRtPlusClass,
TRdsRadioText& aRtPlusData )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsDataRTplus: Class: %d, data: %S", aRtPlusClass, &aRtPlusData );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "Class: %d, data: %S", aRtPlusClass, &aRtPlusData );
const TUint32 frequency = iSettings.TunedFrequency();
const TInt observerCount = iObservers.Count();
for ( TInt i = 0; i < observerCount; ++i )
@@ -328,7 +335,7 @@
//
void CRadioRdsReceiverBase::MrroRdsSearchBeginAF()
{
- LOG( "CRadioRdsReceiverBase::MrroRdsSearchBeginAF" );
+ LEVEL3( LOG_METHOD_AUTO );
const TInt observerCount = iObservers.Count();
for ( TInt i = 0; i < observerCount; ++i )
{
@@ -342,7 +349,8 @@
//
void CRadioRdsReceiverBase::MrroRdsSearchEndAF( TInt aError, TInt aFrequency )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsSearchEndAF: err: %d, Frequency: %d", aError, aFrequency );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError: %d, aFrequency: %d", aError, aFrequency ) );
const TInt observerCount = iObservers.Count();
for ( TInt i = 0; i < observerCount; ++i )
{
@@ -355,27 +363,30 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroRdsStationChangeTA( TInt DEBUGVAR( aFrequency ) )
+void CRadioRdsReceiverBase::MrroRdsStationChangeTA( TInt DEBUGVAR3( aFrequency ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsStationChangeTA: Frequency: %d", aFrequency );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aFrequency: %d", aFrequency ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroRdsEventAutomaticSwitchingChange( TBool DEBUGVAR( aAuto ) )
+void CRadioRdsReceiverBase::MrroRdsEventAutomaticSwitchingChange( TBool DEBUGVAR3( aAuto ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsEventAutomaticSwitchingChange: aAuto: %d", aAuto );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aAuto: %d", aAuto ) );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-void CRadioRdsReceiverBase::MrroRdsEventAutomaticTrafficAnnouncement( TBool DEBUGVAR( aAuto ) )
+void CRadioRdsReceiverBase::MrroRdsEventAutomaticTrafficAnnouncement( TBool DEBUGVAR3( aAuto ) )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsEventAutomaticTrafficAnnouncement: aAuto: %d", aAuto );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aAuto: %d", aAuto ) );
}
// ---------------------------------------------------------------------------
@@ -384,7 +395,8 @@
//
void CRadioRdsReceiverBase::MrroRdsEventSignalChange( TBool aSignal )
{
- LOG_FORMAT( "CRadioRdsReceiverBase::MrroRdsEventSignalChange: aSignal: %d", aSignal );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aSignal: %d", aSignal ) );
iSignalAvailable = aSignal;
const TUint32 frequency = iSettings.TunedFrequency();
const TInt observerCount = iObservers.Count();
--- a/radioengine/engine/src/t_cradiordsreceiversimulator.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,283 +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:
-*
-*/
-
-// User includes
-#include "t_cradiordsreceiversimulator.h"
-#include "mradioenginesettings.h"
-
-const TInt KVRRdsEventSimulationDelay = 5000000;
-const TUint KItemRelatedTagsCount = 2; //songTitles, artistNames
-const TUint KRadioTextItemsCount = 3;
-const TUint KRtToRtPlusEventTimeout = 400000; // 400 ms
-const TUint KSubsequentRtPlusEventsTimeout = 200; // 0.02 ms
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioRdsReceiverSimulator::CRadioRdsReceiverSimulator( MRadioEngineSettings& aSettings )
- : CRadioRdsReceiverBase( aSettings )
- {
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioRdsReceiverSimulator::ConstructL()
- {
- BaseConstructL();
- iEventSimulatorTimer = CPeriodic::NewL( CActive::EPriorityUserInput );
- iEventSimulatorTimer2 = CPeriodic::NewL( CActive::EPriorityUserInput );
- SetAutomaticSwitchingL( iSettings.RdsAfSearchEnabled() );
-
- StartReceiver();
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioRdsReceiverSimulator* CRadioRdsReceiverSimulator::NewL( MRadioEngineSettings& aSettings )
- {
- CRadioRdsReceiverSimulator* self = new (ELeave) CRadioRdsReceiverSimulator( aSettings );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioRdsReceiverSimulator::~CRadioRdsReceiverSimulator()
- {
- if ( iEventSimulatorTimer )
- {
- iEventSimulatorTimer->Cancel();
- }
- if( iEventSimulatorTimer2 )
- {
- iEventSimulatorTimer2->Cancel();
- }
- delete iEventSimulatorTimer;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioRdsReceiverSimulator::InitL( CRadioUtility& /*aRadioUtility*/, CRadioPubSub* aPubSub )
- {
- iPubSub = aPubSub;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioRdsReceiverSimulator::StartReceiver()
- {
- if ( !iEventSimulatorTimer->IsActive() )
- {
- iEventSimulatorTimer->Start( TTimeIntervalMicroSeconds32( KVRRdsEventSimulationDelay ),
- TTimeIntervalMicroSeconds32( KVRRdsEventSimulationDelay ),
- TCallBack( StaticRdsSimulationCallback, this ));
- }
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioRdsReceiverSimulator::StopReceiver()
- {
- iEventSimulatorTimer->Cancel();
- iEventSimulatorTimer2->Cancel();
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRdsReceiverSimulator::StaticRdsSimulationCallback( TAny* aSelfPtr )
- {
- TRadioRdsSimulationEvent events[] = { ERadioRdsEventSignalOn,
- //ERadioRdsEventAFBegin,
- ERadioRdsEventPS,
- ERadioRdsEventRadioText,
- //ERadioRdsEventRadioTextPlus,
- ERadioRdsEventPS,
- ERadioRdsEventRadioText,
- //ERadioRdsEventRadioTextPlus,
- ERadioRdsEventPS,
- ERadioRdsEventRadioText,
- //ERadioRdsEventRadioTextPlus,
- ERadioRdsEventPS,
- ERadioRdsEventRadioText ,
- //ERadioRdsEventPS,
- //ERadioRdsEventAFEnd,
- ERadioRdsEventSignalOff };
-
- TRdsPSName serviceNames[] = { _L("Tesla" ), _L("Tesla" ), _L("Tesla" ) };
- TRdsRadioText radioTexts[] = { _L( "Now playing Madonna Material Girl" ),
- _L( "Hox! Get Motorhead Ace of Spades from music store now for free!" ),
- _L( "Abba station-Waterloo Abba station-Waterloo Abba station" ) };
-
- TInt frequencies[] = { 103100000, 95800000 }; // Frequencies in hz
- TInt numEvents = sizeof( events ) / sizeof( TRadioRdsSimulationEvent );
- TInt numServiceNames = sizeof( serviceNames ) / sizeof( TRdsPSName );
- TInt numFrequencies = sizeof( frequencies ) / sizeof( TInt );
- // RT ( radioTexts[]) and RT+ ( songTitles[] and artistNames[]) information according to PS names ( serviceNames[]).
-
- CRadioRdsReceiverSimulator* self = reinterpret_cast<CRadioRdsReceiverSimulator*>( aSelfPtr );
- if ( self )
- {
- switch ( events[self->iEventIterator] )
- {
- case ERadioRdsEventSignalOn:
- {
- self->MrroRdsEventSignalChange( ETrue );
- break;
- }
-
- case ERadioRdsEventSignalOff:
- {
- self->MrroRdsEventSignalChange( EFalse );
- break;
- }
-
- case ERadioRdsEventPS:
- {
- // Set RT/RT+ iterator value according to PS name iterator: If ERadioRdsEventRadioText or
- // ERadioRdsEventRadioTextPlus arrives, displays RT or RT+ according to radio station name.
- self->iRadioTextIterator = self->iPsIterator;
- self->MrroRdsDataPS( serviceNames[self->iPsIterator] );
- self->iPsIterator++;
- if ( self->iPsIterator >= numServiceNames )
- {
- self->iPsIterator = 0;
- }
- break;
- }
-
- case ERadioRdsEventAFBegin:
- {
- if ( self->iSettings.RdsAfSearchEnabled() )
- {
- self->MrroRdsSearchBeginAF();
- }
- break;
- }
-
- case ERadioRdsEventAFEnd:
- {
- if ( self->iSettings.RdsAfSearchEnabled() )
- {
- self->MrroRdsSearchEndAF( KErrNone, frequencies[self->iFrequencyIterator] );
- }
- self->iFrequencyIterator++;
- if ( self->iFrequencyIterator >= numFrequencies )
- {
- self->iFrequencyIterator = 0;
- }
- break;
- }
- case ERadioRdsEventRadioText:
- {
- // Display RT according to PS name.
- self->MrroRdsDataRT( radioTexts[self->iRadioTextIterator] );
- // how many times StaticRdsSimulationCallback2 entered
- if ( self->iRtPlusIterator >= KItemRelatedTagsCount )
- {
- self->iRtPlusIterator = 0;
- }
-
- // start timer for displaying the two consequent RT+ events
- self->startRTPlusTimer();
-
- // how many radio text tags received
- if( self->iRtIterator >= KRadioTextItemsCount )
- {
- self->iRtIterator = 1;
- }
- else
- {
- self->iRtIterator++;
- }
- break;
- }
- case ERadioRdsEventRadioTextPlus:
- {
- // Display RT+ information according to PS name.
-
- break;
- }
- default:
- break;
- }
- self->iEventIterator++;
- if ( self->iEventIterator >= numEvents )
- {
- self->iEventIterator = 0;
- }
- }
- return KErrNone;
- }
-
-void CRadioRdsReceiverSimulator::startRTPlusTimer()
- {
-
- iEventSimulatorTimer2->Cancel();
- if ( !iEventSimulatorTimer2->IsActive() )
- {
- iEventSimulatorTimer2->Start( TTimeIntervalMicroSeconds32( KRtToRtPlusEventTimeout ),
- TTimeIntervalMicroSeconds32( KSubsequentRtPlusEventsTimeout ),
- TCallBack( StaticRdsSimulationCallback2, this ));
- }
- }
-
-TInt CRadioRdsReceiverSimulator::StaticRdsSimulationCallback2( TAny* aSelfPtr )
- {
- TRdsRadioText songTitles[] = { _L( "Material Girl" ),
- _L( "Ace of Spades" ),
- _L( "Waterloo" ) };
- TRdsRadioText artistNames[] = { _L( "Madonna" ),
- _L( "Motorhead" ),
- _L( "Abba" ) };
-
- CRadioRdsReceiverSimulator* self = reinterpret_cast<CRadioRdsReceiverSimulator*>( aSelfPtr );
-
- if ( self )
- {
- if( self->iRtPlusIterator == 0 )
- {
- self->MrroRdsDataRTplus( ERTplusItemTitle, songTitles[self->iRtIterator-1] );
- }
- else if( self->iRtPlusIterator == 1 )
- {
- self->MrroRdsDataRTplus( ERTplusItemArtist, artistNames[self->iRtIterator-1] );
- }
- }
- self->iRtPlusIterator++;
-
- return KErrNone;
- }
--- a/radioengine/group/buildflags.hrh Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/group/buildflags.hrh Fri Jun 11 13:38:32 2010 +0300
@@ -19,8 +19,5 @@
#ifndef BUILDFLAGS_HRH_
#define BUILDFLAGS_HRH_
-#ifdef __WINS__
-//# define __FEATURE_RDS_SIMULATOR
-#endif
#endif // BUILDFLAGS_HRH_
--- a/radioengine/settings/api/cradiosettings.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/api/cradiosettings.h Fri Jun 11 13:38:32 2010 +0300
@@ -43,7 +43,7 @@
public:
- IMPORT_C static CRadioSettings* NewL( CCoeEnv* aCoeEnv = NULL );
+ IMPORT_C static CRadioSettings* NewL();
IMPORT_C virtual ~CRadioSettings();
@@ -74,13 +74,6 @@
virtual MRadioSettingsSetter& RadioSetter() const = 0;
/**
- * Returns the repository manager.
- *
- * @return The repository manager.
- */
- virtual CRadioRepositoryManager& Repository() const = 0;
-
- /**
* Resolves the most recently updated location for a file.
*
* @param aFileName The file name to be searched.
--- a/radioengine/settings/api/mradioapplicationsettings.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/api/mradioapplicationsettings.h Fri Jun 11 13:38:32 2010 +0300
@@ -30,53 +30,9 @@
public:
- /**
- * Possible states for audio playing state.
- * Once the state reaches ´played´, it doesn't change.
- */
- enum TRadioCRAudioPlayHistory
- {
- ERadioCRInitial,
- ERadioCRAudioTriggered,
- ERadioCRAudioPlayed
- };
-
-public:
-
- /**
- * Stores the currently active preset in the preset list.
- *
- * @param aIndex The list box index of the preset that is
- * currently active.
- */
- virtual TInt SetActiveFocusLocation( TInt aIndex ) = 0;
+ virtual TBool IsFirstTimeStart() = 0;
- /**
- * Retrieves the list box index of the currently active preset.
- * By default, the first preset is active.
- *
- * @return The list box index of the currently active preset.
- */
- virtual TInt ActiveFocusLocation() const = 0;
-
- /**
- * Stores the audio history telling whether the audio has been
- * played ( so that user has triggered it ).
- *
- * Once the history reaches state 'played', it does not change.
- *
- * @param aHistory The audio history.
- */
- virtual void SetAudioPlayHistoryL( TRadioCRAudioPlayHistory aHistory ) = 0;
-
- /**
- * Retrieves the current audio play history.
- *
- * @return The current audio play history.
- */
- virtual TRadioCRAudioPlayHistory AudioPlayHistory() const = 0;
-
- virtual TInt UpdateStartCount() = 0;
+ virtual void SetFirstTimeStartPerformed( TBool aFirstTimeStartPerformed ) = 0;
virtual TInt SetUiFlags( TUint aUiFlags ) = 0;
--- a/radioengine/settings/api/mradioenginesettings.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/api/mradioenginesettings.h Fri Jun 11 13:38:32 2010 +0300
@@ -165,13 +165,6 @@
virtual TInt DecimalCount() const = 0;
/**
- * Retrieves the RDS alternate frequency search setting
- *
- * @return ETrue if AF search is enabled, otherwise EFalse
- */
- virtual TBool RdsAfSearchEnabled() const = 0;
-
- /**
* Retrieves the default region's ID.
*
* @return The region's ID.
@@ -186,11 +179,6 @@
/**
*
*/
- virtual TPtrC SubscriberId() const = 0;
-
- /**
- *
- */
virtual TPtrC CountryCode() const = 0;
};
--- a/radioengine/settings/api/mradiosettingssetter.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/api/mradiosettingssetter.h Fri Jun 11 13:38:32 2010 +0300
@@ -117,13 +117,6 @@
virtual TInt SetRegionId( TInt aRegion ) = 0;
/**
- * Stores the RDS alternate frequency search setting
- *
- * @param aEnabled ETrue if search is enabled, otherwise EFalse
- */
- virtual TInt SetRdsAfSearch( TBool aEnabled ) = 0;
-
- /**
*
*/
virtual TInt SetNetworkId( const TDesC& aNetworkId ) = 0;
@@ -131,11 +124,6 @@
/**
*
*/
- virtual TInt SetSubscriberId( const TDesC& aSubscriberId ) = 0;
-
- /**
- *
- */
virtual TInt SetCountryCode( const TDesC& aCountryCode ) = 0;
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/bwins/fmradioenginesettingsu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,12 @@
+EXPORTS
+ ?Name@CRadioRegion@@QBEABVTDesC16@@XZ @ 1 NONAME ; class TDesC16 const & CRadioRegion::Name(void) const
+ ?SettingItemName@CRadioRegion@@QBEABVTDesC16@@XZ @ 2 NONAME ; class TDesC16 const & CRadioRegion::SettingItemName(void) const
+ ?Id@CRadioRegion@@QBE?AW4TRadioRegion@@XZ @ 3 NONAME ; enum TRadioRegion CRadioRegion::Id(void) const
+ ?MaxFrequency@CRadioRegion@@QBEKXZ @ 4 NONAME ; unsigned long CRadioRegion::MaxFrequency(void) const
+ ?DecimalCount@CRadioRegion@@QBEHXZ @ 5 NONAME ; int CRadioRegion::DecimalCount(void) const
+ ??1CRadioSettings@@UAE@XZ @ 6 NONAME ; CRadioSettings::~CRadioSettings(void)
+ ?NewL@CRadioSettings@@SAPAV1@XZ @ 7 NONAME ; class CRadioSettings * CRadioSettings::NewL(void)
+ ?StepSize@CRadioRegion@@QBEKXZ @ 8 NONAME ; unsigned long CRadioRegion::StepSize(void) const
+ ?CountryCodes@CRadioRegion@@QAEABV?$RPointerArray@VHBufC16@@@@XZ @ 9 NONAME ; class RPointerArray<class HBufC16> const & CRadioRegion::CountryCodes(void)
+ ?MinFrequency@CRadioRegion@@QBEKXZ @ 10 NONAME ; unsigned long CRadioRegion::MinFrequency(void) const
+
--- a/radioengine/settings/bwins/radioenginesettingsu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-EXPORTS
- ??1CRadioSettings@@UAE@XZ @ 1 NONAME ; CRadioSettings::~CRadioSettings(void)
- ?CountryCodes@CRadioRegion@@QAEABV?$RPointerArray@VHBufC16@@@@XZ @ 2 NONAME ; class RPointerArray<class HBufC16> const & CRadioRegion::CountryCodes(void)
- ?DecimalCount@CRadioRegion@@QBEHXZ @ 3 NONAME ; int CRadioRegion::DecimalCount(void) const
- ?Id@CRadioRegion@@QBE?AW4TRadioRegion@@XZ @ 4 NONAME ; enum TRadioRegion CRadioRegion::Id(void) const
- ?MaxFrequency@CRadioRegion@@QBEKXZ @ 5 NONAME ; unsigned long CRadioRegion::MaxFrequency(void) const
- ?MinFrequency@CRadioRegion@@QBEKXZ @ 6 NONAME ; unsigned long CRadioRegion::MinFrequency(void) const
- ?Name@CRadioRegion@@QBEABVTDesC16@@XZ @ 7 NONAME ; class TDesC16 const & CRadioRegion::Name(void) const
- ?NewL@CRadioSettings@@SAPAV1@PAVCCoeEnv@@@Z @ 8 NONAME ; class CRadioSettings * CRadioSettings::NewL(class CCoeEnv *)
- ?SettingItemName@CRadioRegion@@QBEABVTDesC16@@XZ @ 9 NONAME ; class TDesC16 const & CRadioRegion::SettingItemName(void) const
- ?StepSize@CRadioRegion@@QBEKXZ @ 10 NONAME ; unsigned long CRadioRegion::StepSize(void) const
-
Binary file radioengine/settings/cenrep/101FF976.txt has changed
Binary file radioengine/settings/cenrep/2002FF52.txt has changed
Binary file radioengine/settings/cenrep/radio.confml has changed
Binary file radioengine/settings/cenrep/radio_2002FF52.crml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/data/fmradioenginesettings.rss Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,212 @@
+/*
+* 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:
+*
+*/
+
+// Resource identifier
+NAME QRST
+
+// System includes
+#include <uikon.rh>
+
+#include "radiosettings.rh"
+#include "radiopreset.hrh"
+#include "radioengine.hrh"
+
+// Resource definitions
+
+// ---------------------------------------------------------
+// Resource signature
+// ---------------------------------------------------------
+//
+
+RESOURCE RSS_SIGNATURE { }
+
+// Non-operator customisable settings
+
+// ---------------------------------------------------------
+// r_qrad_empty_name_preset
+// TBUF16 stores the string name for the empty "Empty"
+// ---------------------------------------------------------
+//
+RESOURCE TBUF256 r_qrad_empty_name_preset
+{
+ buf = qtn_radio_ch_empty;
+}
+
+// ---------------------------------------------------------
+// r_qrad_predefined_presets
+// Predefined presets list. No need to include empty presets -- they'll get autogenerated!
+// ---------------------------------------------------------
+//
+// The following array must coexist as the VERY LAST Resource IN THIS FILE, to maintain BC!
+RESOURCE RADIOPRESET r_qrad_empty_presets
+{
+ name = "";
+ freq_kHz = 0;
+ serviceid = "";
+ radio_preset_type = ERadioPresetItemEmpty;
+ radio_preset_location = "";
+}
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+STRUCT RADIO_REGION
+ {
+ WORD id;
+ WORD stepsize;
+ LONG minfrequency;
+ LONG maxfrequency;
+ WORD decimalcount;
+ LTEXT countrycodes[] = {""};
+ LTEXT regionname;
+ LTEXT regionsettingname;
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+STRUCT RADIO_REGION_ARRAY
+ {
+ LLINK regions[];
+ }
+
+// ---------------------------------------------------------
+// r_qrad_regions
+// Array of the supported regions
+// ---------------------------------------------------------
+//
+RESOURCE RADIO_REGION_ARRAY r_qrad_regions
+ {
+ regions =
+ {
+ r_qrad_region_japan,
+ r_qrad_region_america,
+ r_qrad_region_default
+ };
+ }
+
+// ---------------------------------------------------------
+// r_qrad_region_japan
+// Region settings for Japan
+// Check country codes from:
+// "COMPLEMENT TO ITU-T RECOMMENDATION E.212, LIST OF MOBILE COUNTRY OR GEOGRAPHICAL AREA CODES"
+// ---------------------------------------------------------
+//
+RESOURCE RADIO_REGION r_qrad_region_japan
+ {
+ id = ERadioRegionJapan;
+ stepsize = 100;
+ minfrequency = 76000;
+ maxfrequency = 90000;
+ decimalcount = 1;
+ countrycodes =
+ {
+ "440",
+ "441"
+ };
+ regionname = qtn_vr_reg_japan;
+ regionsettingname = qtn_vr_set_reg_japan;
+ }
+
+// ---------------------------------------------------------
+// r_qrad_region_america
+// Region settings for America
+// "COMPLEMENT TO ITU-T RECOMMENDATION E.212, LIST OF MOBILE COUNTRY OR GEOGRAPHICAL AREA CODES"
+// ---------------------------------------------------------
+//
+RESOURCE RADIO_REGION r_qrad_region_america
+ {
+ id = ERadioRegionAmerica;
+ stepsize = 200;
+ minfrequency = 88100;
+ maxfrequency = 107900;
+ decimalcount = 1;
+ countrycodes =
+ {
+ "302", // Canada
+ "310", // USA
+ "311", // USA
+ "312", // USA
+ "313", // USA
+ "314", // USA
+ "315", // USA
+ "316", // USA
+ "332", // United States Virgin Islands
+ "334", // Mexico
+ "338", // Jamaica
+ "342", // Barbados
+ "344", // Antigua and Barbuda
+ "352", // Grenada
+ "360", // Saint Vincent and the Grenadines
+ "364", // Bahamas
+ "366", // Common Wealth of Dominica
+ "370", // Dominican Republic
+ "372", // Haiti
+ "374", // Trinidad and Tobago
+ "368", // Cuba
+ "702", // Belize
+ "704", // Guatemala
+ "706", // El Salvador
+ "708", // Honduras
+ "710", // Nicaragua
+ "712", // Costa Rica
+ "714", // Panama
+ "716", // Peru
+ "722", // Argentina
+ "724", // Brazil
+ "730", // Chile
+ "732", // Colombia
+ "734", // Venezuela
+ "736", // Bolivia
+ "738", // Guyana
+ "740", // Ecuador
+ "744", // Paraguay
+ "746", // Suriname
+ "748" // Uruguay
+ };
+ regionname = qtn_vr_reg_america;
+ regionsettingname = qtn_vr_set_reg_america;
+ }
+
+// ---------------------------------------------------------
+// r_qrad_region_default
+// Region settings for default region
+// ---------------------------------------------------------
+//
+RESOURCE RADIO_REGION r_qrad_region_default
+ {
+ id = ERadioRegionDefault;
+ stepsize = 50;
+ minfrequency = 87500;
+ maxfrequency = 108000;
+ decimalcount = 2;
+ regionname = qtn_vr_reg_other;
+ regionsettingname = qtn_vr_set_reg_other;
+ }
+
+// ---------------------------------------------------------
+// r_qtn_qrad_folder_radio_presets
+// TBUF32 stores the string for presets folder name
+// String lenght must be 30 characters
+// ---------------------------------------------------------
+//
+RESOURCE TBUF32 r_qtn_qrad_folder_radio_presets
+ {
+ buf = qtn_vr_folder_radio_presets;
+ }
--- a/radioengine/settings/data/radioenginesettings.rss Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +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:
-*
-*/
-
-// Resource identifier
-NAME QRST
-
-// System includes
-#include <uikon.rh>
-
-#include "radiosettings.rh"
-#include "radiopreset.hrh"
-#include "radioengine.hrh"
-
-// Resource definitions
-
-// ---------------------------------------------------------
-// Resource signature
-// ---------------------------------------------------------
-//
-
-RESOURCE RSS_SIGNATURE { }
-
-// Non-operator customisable settings
-
-// ---------------------------------------------------------
-// r_qrad_empty_name_preset
-// TBUF16 stores the string name for the empty "Empty"
-// ---------------------------------------------------------
-//
-RESOURCE TBUF256 r_qrad_empty_name_preset
-{
- buf = qtn_radio_ch_empty;
-}
-
-// ---------------------------------------------------------
-// r_qrad_predefined_presets
-// Predefined presets list. No need to include empty presets -- they'll get autogenerated!
-// ---------------------------------------------------------
-//
-// The following array must coexist as the VERY LAST Resource IN THIS FILE, to maintain BC!
-RESOURCE RADIOPRESET r_qrad_empty_presets
-{
- name = "";
- freq_kHz = 0;
- serviceid = "";
- radio_preset_type = ERadioPresetItemEmpty;
- radio_preset_location = "";
-}
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-STRUCT RADIO_REGION
- {
- WORD id;
- WORD stepsize;
- LONG minfrequency;
- LONG maxfrequency;
- WORD decimalcount;
- LTEXT countrycodes[] = {""};
- LTEXT regionname;
- LTEXT regionsettingname;
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-STRUCT RADIO_REGION_ARRAY
- {
- LLINK regions[];
- }
-
-// ---------------------------------------------------------
-// r_qrad_regions
-// Array of the supported regions
-// ---------------------------------------------------------
-//
-RESOURCE RADIO_REGION_ARRAY r_qrad_regions
- {
- regions =
- {
- r_qrad_region_japan,
- r_qrad_region_america,
- r_qrad_region_default
- };
- }
-
-// ---------------------------------------------------------
-// r_qrad_region_japan
-// Region settings for Japan
-// Check country codes from:
-// "COMPLEMENT TO ITU-T RECOMMENDATION E.212, LIST OF MOBILE COUNTRY OR GEOGRAPHICAL AREA CODES"
-// ---------------------------------------------------------
-//
-RESOURCE RADIO_REGION r_qrad_region_japan
- {
- id = ERadioRegionJapan;
- stepsize = 100;
- minfrequency = 76000;
- maxfrequency = 90000;
- decimalcount = 1;
- countrycodes =
- {
- "440",
- "441"
- };
- regionname = qtn_vr_reg_japan;
- regionsettingname = qtn_vr_set_reg_japan;
- }
-
-// ---------------------------------------------------------
-// r_qrad_region_america
-// Region settings for America
-// "COMPLEMENT TO ITU-T RECOMMENDATION E.212, LIST OF MOBILE COUNTRY OR GEOGRAPHICAL AREA CODES"
-// ---------------------------------------------------------
-//
-RESOURCE RADIO_REGION r_qrad_region_america
- {
- id = ERadioRegionAmerica;
- stepsize = 200;
- minfrequency = 88100;
- maxfrequency = 107900;
- decimalcount = 1;
- countrycodes =
- {
- "302", // Canada
- "310", // USA
- "311", // USA
- "312", // USA
- "313", // USA
- "314", // USA
- "315", // USA
- "316", // USA
- "332", // United States Virgin Islands
- "334", // Mexico
- "338", // Jamaica
- "342", // Barbados
- "344", // Antigua and Barbuda
- "352", // Grenada
- "360", // Saint Vincent and the Grenadines
- "364", // Bahamas
- "366", // Common Wealth of Dominica
- "370", // Dominican Republic
- "372", // Haiti
- "374", // Trinidad and Tobago
- "368", // Cuba
- "702", // Belize
- "704", // Guatemala
- "706", // El Salvador
- "708", // Honduras
- "710", // Nicaragua
- "712", // Costa Rica
- "714", // Panama
- "716", // Peru
- "722", // Argentina
- "724", // Brazil
- "730", // Chile
- "732", // Colombia
- "734", // Venezuela
- "736", // Bolivia
- "738", // Guyana
- "740", // Ecuador
- "744", // Paraguay
- "746", // Suriname
- "748" // Uruguay
- };
- regionname = qtn_vr_reg_america;
- regionsettingname = qtn_vr_set_reg_america;
- }
-
-// ---------------------------------------------------------
-// r_qrad_region_default
-// Region settings for default region
-// ---------------------------------------------------------
-//
-RESOURCE RADIO_REGION r_qrad_region_default
- {
- id = ERadioRegionDefault;
- stepsize = 50;
- minfrequency = 87500;
- maxfrequency = 108000;
- decimalcount = 2;
- regionname = qtn_vr_reg_other;
- regionsettingname = qtn_vr_set_reg_other;
- }
-
-// ---------------------------------------------------------
-// r_qtn_qrad_folder_radio_presets
-// TBUF32 stores the string for presets folder name
-// String lenght must be 30 characters
-// ---------------------------------------------------------
-//
-RESOURCE TBUF32 r_qtn_qrad_folder_radio_presets
- {
- buf = qtn_vr_folder_radio_presets;
- }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/eabi/fmradioenginesettingsu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,14 @@
+EXPORTS
+ _ZN12CRadioRegion12CountryCodesEv @ 1 NONAME
+ _ZN14CRadioSettings4NewLEv @ 2 NONAME
+ _ZN14CRadioSettingsD0Ev @ 3 NONAME
+ _ZN14CRadioSettingsD1Ev @ 4 NONAME
+ _ZN14CRadioSettingsD2Ev @ 5 NONAME
+ _ZNK12CRadioRegion12DecimalCountEv @ 6 NONAME
+ _ZNK12CRadioRegion12MaxFrequencyEv @ 7 NONAME
+ _ZNK12CRadioRegion12MinFrequencyEv @ 8 NONAME
+ _ZNK12CRadioRegion15SettingItemNameEv @ 9 NONAME
+ _ZNK12CRadioRegion2IdEv @ 10 NONAME
+ _ZNK12CRadioRegion4NameEv @ 11 NONAME
+ _ZNK12CRadioRegion8StepSizeEv @ 12 NONAME
+
--- a/radioengine/settings/eabi/radioenginesettingsu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXPORTS
- _ZN12CRadioRegion12CountryCodesEv @ 1 NONAME
- _ZN14CRadioSettings4NewLEP7CCoeEnv @ 2 NONAME
- _ZN14CRadioSettingsD0Ev @ 3 NONAME
- _ZN14CRadioSettingsD1Ev @ 4 NONAME
- _ZN14CRadioSettingsD2Ev @ 5 NONAME
- _ZNK12CRadioRegion12DecimalCountEv @ 6 NONAME
- _ZNK12CRadioRegion12MaxFrequencyEv @ 7 NONAME
- _ZNK12CRadioRegion12MinFrequencyEv @ 8 NONAME
- _ZNK12CRadioRegion15SettingItemNameEv @ 9 NONAME
- _ZNK12CRadioRegion2IdEv @ 10 NONAME
- _ZNK12CRadioRegion4NameEv @ 11 NONAME
- _ZNK12CRadioRegion8StepSizeEv @ 12 NONAME
-
--- a/radioengine/settings/group/bld.inf Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/group/bld.inf Fri Jun 11 13:38:32 2010 +0300
@@ -24,12 +24,11 @@
PRJ_EXPORTS
-//../sis/visualradiostub.sis /epoc32/data/z/system/install/visualradio.sis
-backup_registration.xml /epoc32/data/z/private/101ff976/backup_registration.xml
+backup_registration.xml /epoc32/data/z/private/2002FF52/backup_registration.xml
-../cenrep/101FF976.txt /epoc32/data/z/private/10202be9/101FF976.txt
-../cenrep/101FF976.txt /epoc32/RELEASE/winscw/UDEB/Z/private/10202be9/101FF976.txt
-../cenrep/101FF976.txt /epoc32/RELEASE/winscw/UREL/Z/private/10202be9/101FF976.txt
+../cenrep/2002FF52.txt /epoc32/data/z/private/10202be9/2002FF52.txt
+../cenrep/2002FF52.txt /epoc32/RELEASE/winscw/UDEB/Z/private/10202be9/2002FF52.txt
+../cenrep/2002FF52.txt /epoc32/RELEASE/winscw/UREL/Z/private/10202be9/2002FF52.txt
PRJ_MMPFILES
radioenginesettings.mmp
--- a/radioengine/settings/group/radioenginesettings.mmp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/group/radioenginesettings.mmp Fri Jun 11 13:38:32 2010 +0300
@@ -24,9 +24,9 @@
#include <data_caging_paths.hrh>
-TARGET radioenginesettings.dll
+TARGET fmradioenginesettings.dll
TARGETTYPE DLL
-UID 0x1000008D 0x101FF94C
+UID 0x1000008D 0x2002FF50
VERSION 10.0
CAPABILITY CAP_GENERAL_DLL
@@ -36,7 +36,7 @@
LANG SC
SOURCEPATH ../data
-START RESOURCE radioenginesettings.rss
+START RESOURCE fmradioenginesettings.rss
HEADER
TARGETPATH RESOURCE_FILES_DIR
END // RESOURCE
@@ -51,14 +51,14 @@
SOURCE cradioregion.cpp
SOURCE cradiosettings.cpp
SOURCE cradiosettingsimp.cpp
-SOURCE cradiosettingsbase.cpp
SOURCE cradioenginesettings.cpp
SOURCE cradioapplicationsettings.cpp
-LIBRARY radioengineutils.lib
+LIBRARY fmradioengineutils.lib
LIBRARY bafl.lib
LIBRARY commonengine.lib
LIBRARY cone.lib
LIBRARY efsrv.lib
LIBRARY estor.lib
LIBRARY euser.lib
+LIBRARY centralrepository.lib
--- a/radioengine/settings/inc/cradioapplicationsettings.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/inc/cradioapplicationsettings.h Fri Jun 11 13:38:32 2010 +0300
@@ -20,36 +20,38 @@
// User includes
#include "mradioapplicationsettings.h"
-#include "cradiosettingsbase.h"
+
+// Forward declarations
+class CRepository;
/**
* Concrete implementation of application settings.
*/
-NONSHARABLE_CLASS( CRadioApplicationSettings ) : public CRadioSettingsBase
+NONSHARABLE_CLASS( CRadioApplicationSettings ) : public CBase
, public MRadioApplicationSettings
{
public:
- static CRadioApplicationSettings* NewL( CRadioRepositoryManager& aRepositoryManager, CCoeEnv& aCoeEnv );
+ static CRadioApplicationSettings* NewL();
~CRadioApplicationSettings();
// from base class MRadioApplicationSettings
- TInt SetActiveFocusLocation( TInt aIndex );
- TInt ActiveFocusLocation() const;
- void SetAudioPlayHistoryL( TRadioCRAudioPlayHistory aHistory );
- TRadioCRAudioPlayHistory AudioPlayHistory() const;
- TInt UpdateStartCount();
+ TBool IsFirstTimeStart();
+ void SetFirstTimeStartPerformed( TBool aFirstTimeStartPerformed );
TInt SetUiFlags( TUint aUiFlags );
TUint UiFlags() const;
private:
- CRadioApplicationSettings( CRadioRepositoryManager& aRepositoryManager, CCoeEnv& aCoeEnv );
+ CRadioApplicationSettings();
void ConstructL();
+
+private: // data
+ CRepository* iRepository;
};
--- a/radioengine/settings/inc/cradioenginesettings.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/inc/cradioenginesettings.h Fri Jun 11 13:38:32 2010 +0300
@@ -22,23 +22,36 @@
#include "mradioenginesettings.h"
#include "mradiosettingssetter.h"
#include "cradioregion.h"
-#include "mradiorepositoryentityobserver.h"
-#include "cradiosettingsbase.h"
// Forward declarations
class MRadioSettingsObserver;
+class CRepository;
+class CRadioSettingsImp;
+
+// Constants
+
+/**
+ * Maximum size of the network country code.
+ * From CTelephony::TNetworkInfoV1 in etel3rdparty.h
+ */
+enum { KNetworkCountryCodeSize = 4 };
+
+/**
+ * Maximum size of the network identity.
+ * From CTelephony::TNetworkInfoV1 in etel3rdparty.h
+ */
+enum { KNetworkIdentitySize = 8 };
/**
* Concrete implementation of radio settings.
*/
-NONSHARABLE_CLASS( CRadioEngineSettings ) : public CRadioSettingsBase
+NONSHARABLE_CLASS( CRadioEngineSettings ) : public CBase
, public MRadioSettingsSetter
- , public MRadioRepositoryEntityObserver
{
public:
- static CRadioEngineSettings* NewL( CRadioRepositoryManager& aRepositoryManager, CCoeEnv& aCoeEnv );
+ static CRadioEngineSettings* NewL( CRadioSettingsImp& aRadioSettingsImp );
~CRadioEngineSettings();
@@ -49,7 +62,7 @@
private:
- CRadioEngineSettings( CRadioRepositoryManager& aRepositoryManager, CCoeEnv& aCoeEnv );
+ CRadioEngineSettings( CRadioSettingsImp& aRadioSettingsImp );
void ConstructL();
@@ -73,10 +86,8 @@
TUint32 MaxFrequency() const;
TUint32 MinFrequency() const;
TInt DecimalCount() const;
- TBool RdsAfSearchEnabled() const;
TRadioRegion DefaultRegion() const;
TPtrC NetworkId() const;
- TPtrC SubscriberId() const;
TPtrC CountryCode() const;
// from base class MRadioSettingsSetter
@@ -93,25 +104,31 @@
TInt SetPowerOn( TBool aPowerState );
TInt SetTunedFrequency( TUint32 aFrequency );
TInt SetRegionId( TInt aRegion );
- TInt SetRdsAfSearch( TBool aEnabled );
TInt SetNetworkId( const TDesC& aNetworkId );
- TInt SetSubscriberId( const TDesC& aSubscriberId );
TInt SetCountryCode( const TDesC& aCountryCode );
-// from base class MRadioRepositoryEntityObserver
-
- void HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, TInt aValue, TInt aError );
- void HandleRepositoryValueChangeL( const TUid& /*aUid*/, TUint32 /*aKey*/, const TReal& /*aValue*/, TInt /*aError*/ ) {}
- void HandleRepositoryValueChangeL( const TUid& /*aUid*/, TUint32 /*aKey*/, const TDesC8& /*aValue*/, TInt /*aError*/ ) {}
- void HandleRepositoryValueChangeL( const TUid& /*aUid*/, TUint32 /*aKey*/, const TDesC16& /*aValue*/, TInt /*aError*/ ) {}
-
// New functions
/**
+ * Initializes the data holders
+ */
+ void InitializeDataHolders();
+
+ /**
+ * Gets a repository value and sets the default value if the key is not found
+ */
+ TBool GetRepositoryValue( int aKey, TInt& aValue, TInt aDefault );
+
+ /**
+ * Sets a boolean value to cenrep and data holder
+ */
+ TInt SetFlagValue( int aKey, int aFlagId, TInt aValue );
+
+ /**
* Initializes the regions as defined in the resource file.
*/
void InitializeRegionsL();
-
+
/**
* Converts Region ID to index
*
@@ -133,17 +150,34 @@
* The observer for the setting changes.
* Not own.
*/
- MRadioSettingsObserver* iObserver;
+ MRadioSettingsObserver* iObserver;
/**
* The available regions.
*/
- RRadioRegionArray iRegions;
+ RRadioRegionArray iRegions;
/**
* The current region.
*/
- TInt iCurrentRegionIdx;
+ TInt iCurrentRegionIdx;
+
+ CRadioSettingsImp& iRadioSettingsImp;
+
+ RResourceFile iResFile;
+
+ CRepository* iRepository;
+
+ // Data holders for quick access
+ TBitFlags iFlags;
+ TBuf<KNetworkIdentitySize> iNetworkId;
+ TBuf<KNetworkCountryCodeSize> iCountryCode;
+ TInt iHeadsetVolume;
+ TInt iSpeakerVolume;
+ TUint32 iFrequency;
+ TInt iDefaultMinVolume;
+ TRadioRegion iDefaultRegion;
+ TRadioRegion iRegionId;
};
--- a/radioengine/settings/inc/cradiosettingsbase.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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 C_RADIOSETTINGSBASE_H
-#define C_RADIOSETTINGSBASE_H
-
-// System includes
-#include <badesca.h>
-#include <e32base.h>
-
-// Forward declarations
-class CCoeEnv;
-class CRadioRepositoryManager;
-
-/**
- * Base class for all settings implementations.
- *
- * Provides commonly used data members and methods.
- */
-NONSHARABLE_CLASS( CRadioSettingsBase ) : public CBase
- {
-
-public:
-
- ~CRadioSettingsBase();
-
-protected:
-
- CRadioSettingsBase( CRadioRepositoryManager& aRepositoryManager, CCoeEnv& aCoeEnv );
-
- /**
- * Writes an array to the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key to which to write the array.
- * @param aArray The array to write.
- */
- void WriteArrayEntityL( const TUid& aUid, TUint32 aKey, const CDesCArray& aArray );
-
- /**
- * Reads an array from the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key to which to write the array.
- * @return The array that was read. Ownership is transferred to the caller.
- */
- CDesCArray* ReadArrayEntityL( const TUid& aUid, TUint32 aKey ) const;
-
-protected:
-
- /**
- * The control environment.
- */
- CCoeEnv& iCoeEnv;
-
- /**
- * The repository manager.
- */
- CRadioRepositoryManager& iRepositoryManager;
-
- };
-
-#endif // C_RADIOSETTINGSBASE_H
--- a/radioengine/settings/inc/cradiosettingsimp.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/inc/cradiosettingsimp.h Fri Jun 11 13:38:32 2010 +0300
@@ -18,16 +18,19 @@
#ifndef C_RADIOSETTINGSIMP_H
#define C_RADIOSETTINGSIMP_H
+// System includes
+#include <barsc.h>
// User includes
#include "cradiosettings.h"
// Forward declarations
-class CCoeEnv;
class CRadioApplicationSettings;
class CRadioEngineSettings;
-class CRadioRepositoryManager;
class RConeResourceLoader;
+// The name of the radio settings resource file.
+_LIT( KRadioSettingsResourceFile, "fmradioenginesettings.rsc" );
+
/**
* Manages persistent application settings.
*
@@ -38,45 +41,29 @@
public:
- static CRadioSettingsImp* NewL( CCoeEnv* aCoeEnv = NULL );
+ static CRadioSettingsImp* NewL();
~CRadioSettingsImp();
+ RFs& FsSession();
+
// from base class CRadioSettings
TBool IsRegionAllowed( TRadioRegion aRegionId ) const;
MRadioApplicationSettings& ApplicationSettings() const;
MRadioEngineSettings& EngineSettings() const;
MRadioSettingsSetter& RadioSetter() const;
- CRadioRepositoryManager& Repository() const;
void ResolveDriveL( TFileName& aFileName, const TDesC& aPath );
private:
CRadioSettingsImp();
- void ConstructL( CCoeEnv* aCoeEnv );
-
- /**
- * Loads the resources required by the settings.
- */
- void LoadResourcesL();
+ void ConstructL();
private: // data
/**
- * The central repository manager.
- * Own.
- */
- CRadioRepositoryManager* iRepositoryManager;
-
- /**
- * Resource loader for the settings resources.
- * Own.
- */
- RConeResourceLoader* iResourceLoader;
-
- /**
* Implementation of the application settings.
* Own
*/
@@ -87,6 +74,12 @@
* Own
*/
CRadioEngineSettings* iEngineSettings;
+
+ /**
+ * File session.
+ * Own
+ */
+ RFs* iFsSession;
};
--- a/radioengine/settings/src/cradioapplicationsettings.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/src/cradioapplicationsettings.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -15,12 +15,19 @@
*
*/
+// System includes
+#include <centralrepository.h>
+
// User includes
+#include "cradiosettingsimp.h"
#include "radiointernalcrkeys.h"
#include "cradioapplicationsettings.h"
-#include "cradiorepositorymanager.h"
#include "cradioenginelogger.h"
+// This has to be the last include.
+#ifdef STUB_CONSTELLATION
+# include <RadioStubManager.h>
+#endif //STUB_CONSTELLATION
// ======== MEMBER FUNCTIONS ========
@@ -28,10 +35,10 @@
//
// ---------------------------------------------------------------------------
//
-CRadioApplicationSettings* CRadioApplicationSettings::NewL( CRadioRepositoryManager& aRepositoryManager,
- CCoeEnv& aCoeEnv )
+CRadioApplicationSettings* CRadioApplicationSettings::NewL()
{
- CRadioApplicationSettings* self = new ( ELeave ) CRadioApplicationSettings( aRepositoryManager, aCoeEnv );
+ LEVEL3( LOG_METHOD_AUTO );
+ CRadioApplicationSettings* self = new ( ELeave ) CRadioApplicationSettings();
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
@@ -44,19 +51,18 @@
//
void CRadioApplicationSettings::ConstructL()
{
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRActiveFocusLocation, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRAudioPlayHistory, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRUiFlags, CRadioRepositoryManager::ERadioEntityInt );
+ LEVEL2( LOG_METHOD_AUTO );
+ iRepository = CRepository::NewL( KRadioCRUid );
+ LOG_FORMAT( "iRepository = %i", iRepository );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-CRadioApplicationSettings::CRadioApplicationSettings( CRadioRepositoryManager& aRepositoryManager,
- CCoeEnv& aCoeEnv )
- : CRadioSettingsBase( aRepositoryManager, aCoeEnv )
+CRadioApplicationSettings::CRadioApplicationSettings()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -65,26 +71,8 @@
//
CRadioApplicationSettings::~CRadioApplicationSettings()
{
- }
-
-// ---------------------------------------------------------------------------
-// From class MRadioApplicationSettings.
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRadioApplicationSettings::SetActiveFocusLocation( TInt aIndex )
- {
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRActiveFocusLocation, aIndex );
- }
-
-// ---------------------------------------------------------------------------
-// From class MRadioApplicationSettings.
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRadioApplicationSettings::ActiveFocusLocation() const
- {
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRActiveFocusLocation );
+ LEVEL3( LOG_METHOD_AUTO );
+ delete iRepository;
}
// ---------------------------------------------------------------------------
@@ -92,12 +80,13 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioApplicationSettings::SetAudioPlayHistoryL( TRadioCRAudioPlayHistory aHistory )
+TBool CRadioApplicationSettings::IsFirstTimeStart()
{
- if ( AudioPlayHistory() != ERadioCRAudioPlayed )
- {
- User::LeaveIfError( iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRAudioPlayHistory, aHistory ) );
- }
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt startCount = 0;
+ iRepository->Get( KRadioCRLaunchCount, startCount );
+
+ return startCount == 0;
}
// ---------------------------------------------------------------------------
@@ -105,27 +94,12 @@
//
// ---------------------------------------------------------------------------
//
-MRadioApplicationSettings::TRadioCRAudioPlayHistory CRadioApplicationSettings::AudioPlayHistory() const
+void CRadioApplicationSettings::SetFirstTimeStartPerformed( TBool aFirstTimeStartPerformed )
{
- return static_cast<TRadioCRAudioPlayHistory>(
- iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRAudioPlayHistory ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ iRepository->Set( KRadioCRLaunchCount, aFirstTimeStartPerformed ? 1 : 0 );
}
-// ---------------------------------------------------------------------------
-// From class MRadioApplicationSettings.
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRadioApplicationSettings::UpdateStartCount()
- {
- TInt startCount = 0;
- TRAP_IGNORE
- (
- CRadioRepositoryManager::GetRepositoryValueL( KRadioCRUid, KRadioCRLaunchCount, startCount );
- CRadioRepositoryManager::SetRepositoryValueL( KRadioCRUid, KRadioCRLaunchCount, startCount + 1 );
- );
- return startCount;
- }
// ---------------------------------------------------------------------------
// From class MRadioApplicationSettings.
@@ -134,7 +108,8 @@
//
TInt CRadioApplicationSettings::SetUiFlags( TUint aUiFlags )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRUiFlags, static_cast<TInt>( aUiFlags ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iRepository->Set( KRadioCRUiFlags, static_cast<TInt>( aUiFlags ) );
}
// ---------------------------------------------------------------------------
@@ -144,5 +119,8 @@
//
TUint CRadioApplicationSettings::UiFlags() const
{
- return static_cast<TUint>( iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRUiFlags ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt uiFlags( 0 );
+ iRepository->Get( KRadioCRUiFlags, uiFlags );
+ return static_cast<TUint>( uiFlags );
}
--- a/radioengine/settings/src/cradioenginesettings.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/src/cradioenginesettings.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -18,14 +18,50 @@
// System includes
#include <barsread.h>
#include <coemain.h>
+#include <bautils.h>
+#include <data_caging_path_literals.hrh>
+#include <fmradioenginesettings.rsg>
+#include <centralrepository.h>
// User includes
#include "radiointernalcrkeys.h"
-#include "radioenginesettings.rsg"
#include "radioenginedef.h"
#include "cradioenginesettings.h"
+#include "cradiosettingsimp.h"
#include "mradiosettingsobserver.h"
-#include "cradiorepositorymanager.h"
+#include "cradioenginelogger.h"
+
+// This has to be the last include.
+#ifdef STUB_CONSTELLATION
+# include <RadioStubManager.h>
+#endif //STUB_CONSTELLATION
+
+
+ /**
+ * On/Off type flags used by TBitFlags.
+ */
+ enum TFlagValues
+ {
+ EHeadsetVolMuted = 1 << 0
+ ,ESpeakerVolMuted = 1 << 1
+ ,EPowerOn = 1 << 2
+ ,EStereoOutput = 1 << 3
+ ,EHeadsetAudioRoute = 1 << 4
+ };
+
+// ======== LOCAL FUNCTIONS ========
+
+ // ---------------------------------------------------------------------------
+ // Normalize return value from TBitFlags to 1 or 0 just in case
+ // Two negations: 16 => 0 => 1
+ // ---------------------------------------------------------------------------
+ //
+static TBool NormalizeBool( TBool aBool )
+ {
+ // Normalize return value from TBitFlags to 1 or 0 just in case
+ // Two negations: 16 => 0 => 1
+ return !( !aBool );
+ }
// ======== MEMBER FUNCTIONS ========
@@ -34,10 +70,10 @@
//
// ---------------------------------------------------------------------------
//
-CRadioEngineSettings* CRadioEngineSettings::NewL( CRadioRepositoryManager& aRepositoryManager,
- CCoeEnv& aCoeEnv )
+CRadioEngineSettings* CRadioEngineSettings::NewL( CRadioSettingsImp& aRadioSettingsImp )
{
- CRadioEngineSettings* self = new ( ELeave ) CRadioEngineSettings( aRepositoryManager, aCoeEnv );
+ LEVEL3( LOG_METHOD_AUTO );
+ CRadioEngineSettings* self = new ( ELeave ) CRadioEngineSettings( aRadioSettingsImp );
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
@@ -50,32 +86,22 @@
//
void CRadioEngineSettings::ConstructL()
{
- iRepositoryManager.AddObserverL( this );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRHeadsetVolume, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRSpeakerVolume, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCROutputMode, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRAudioRoute, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRHeadsetMuteState, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRSpeakerMuteState, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRVisualRadioPowerState, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRTunedFrequency, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRDefaultMinVolumeLevel, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRCurrentRegion, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRRdsAfSearch, CRadioRepositoryManager::ERadioEntityInt );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRNetworkId, CRadioRepositoryManager::ERadioEntityDes16 );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRSubscriberId, CRadioRepositoryManager::ERadioEntityDes16 );
- iRepositoryManager.AddEntityL( KRadioCRUid, KRadioCRCountryCode, CRadioRepositoryManager::ERadioEntityDes16 );
+ LEVEL3( LOG_METHOD_AUTO );
+ iRepository = CRepository::NewL( KRadioCRUid );
InitializeRegionsL();
+
+ InitializeDataHolders();
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-CRadioEngineSettings::CRadioEngineSettings( CRadioRepositoryManager& aRepositoryManager, CCoeEnv& aCoeEnv )
- : CRadioSettingsBase( aRepositoryManager, aCoeEnv )
+CRadioEngineSettings::CRadioEngineSettings( CRadioSettingsImp& aRadioSettingsImp )
+ : iRadioSettingsImp( aRadioSettingsImp )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -84,9 +110,11 @@
//
CRadioEngineSettings::~CRadioEngineSettings()
{
- iRepositoryManager.RemoveObserver( this );
+ LEVEL3( LOG_METHOD_AUTO );
iRegions.ResetAndDestroy();
iRegions.Close();
+ iResFile.Close();
+ delete iRepository;
}
// ---------------------------------------------------------------------------
@@ -95,6 +123,7 @@
//
void CRadioEngineSettings::SetObserver( MRadioSettingsObserver* aObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
iObserver = aObserver;
}
@@ -104,7 +133,13 @@
//
TInt CRadioEngineSettings::SetHeadsetVolume( TInt aVolume )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRHeadsetVolume, aVolume );
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt err = iRepository->Set( KRadioCRHeadsetVolume, aVolume );
+ if ( !err )
+ {
+ iHeadsetVolume = aVolume;
+ }
+ return err;
}
// ---------------------------------------------------------------------------
@@ -113,7 +148,8 @@
//
TInt CRadioEngineSettings::HeadsetVolume() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRHeadsetVolume );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iHeadsetVolume;
}
// ---------------------------------------------------------------------------
@@ -122,7 +158,13 @@
//
TInt CRadioEngineSettings::SetSpeakerVolume( TInt aVolume )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRSpeakerVolume, aVolume );
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt err = iRepository->Set( KRadioCRSpeakerVolume, aVolume );
+ if ( !err )
+ {
+ iSpeakerVolume = aVolume;
+ }
+ return err;
}
// ---------------------------------------------------------------------------
@@ -131,7 +173,8 @@
//
TInt CRadioEngineSettings::SpeakerVolume() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRSpeakerVolume );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iSpeakerVolume;
}
// ---------------------------------------------------------------------------
@@ -140,6 +183,7 @@
//
TInt CRadioEngineSettings::SetVolume( TInt aVolume )
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( AudioRoute() == RadioEngine::ERadioHeadset )
{
return SetHeadsetVolume( aVolume );
@@ -156,6 +200,7 @@
//
TInt CRadioEngineSettings::Volume() const
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( AudioRoute() == RadioEngine::ERadioHeadset )
{
return HeadsetVolume();
@@ -173,7 +218,13 @@
//
TInt CRadioEngineSettings::SetOutputMode( TInt aOutputMode )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCROutputMode, aOutputMode );
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt err = iRepository->Set( KRadioCROutputMode, aOutputMode );
+ if ( !err )
+ {
+ iFlags.Assign( EStereoOutput, aOutputMode == RadioEngine::ERadioStereo );
+ }
+ return err;
}
// ---------------------------------------------------------------------------
@@ -183,7 +234,8 @@
//
TInt CRadioEngineSettings::OutputMode() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCROutputMode );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iFlags.IsSet( EStereoOutput ) ? RadioEngine::ERadioStereo : RadioEngine::ERadioMono;
}
// ---------------------------------------------------------------------------
@@ -193,7 +245,13 @@
//
TInt CRadioEngineSettings::SetAudioRoute( TInt aAudioRoute )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRAudioRoute, aAudioRoute );
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt err = iRepository->Set( KRadioCRAudioRoute, aAudioRoute );
+ if ( !err )
+ {
+ iFlags.Assign( EHeadsetAudioRoute, aAudioRoute == RadioEngine::ERadioHeadset );
+ }
+ return err;
}
// ---------------------------------------------------------------------------
@@ -203,7 +261,8 @@
//
TInt CRadioEngineSettings::AudioRoute() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRAudioRoute );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iFlags.IsSet( EHeadsetAudioRoute ) ? RadioEngine::ERadioHeadset : RadioEngine::ERadioSpeaker;
}
// ---------------------------------------------------------------------------
@@ -213,7 +272,8 @@
//
TInt CRadioEngineSettings::SetHeadsetVolMuted( TBool aMuted )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRHeadsetMuteState, aMuted );
+ LEVEL3( LOG_METHOD_AUTO );
+ return SetFlagValue( KRadioCRHeadsetMuteState, EHeadsetVolMuted, aMuted );
}
// ---------------------------------------------------------------------------
@@ -223,7 +283,8 @@
//
TBool CRadioEngineSettings::IsHeadsetVolMuted() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRHeadsetMuteState );
+ LEVEL3( LOG_METHOD_AUTO );
+ return NormalizeBool( iFlags.IsSet( EHeadsetVolMuted ) );
}
// ---------------------------------------------------------------------------
@@ -233,7 +294,8 @@
//
TInt CRadioEngineSettings::SetSpeakerVolMuted( TBool aMuted )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRSpeakerMuteState, aMuted );
+ LEVEL3( LOG_METHOD_AUTO );
+ return SetFlagValue( KRadioCRSpeakerMuteState, ESpeakerVolMuted, aMuted );
}
// ---------------------------------------------------------------------------
@@ -243,7 +305,8 @@
//
TBool CRadioEngineSettings::IsSpeakerVolMuted() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRSpeakerMuteState );
+ LEVEL3( LOG_METHOD_AUTO );
+ return NormalizeBool( iFlags.IsSet( ESpeakerVolMuted ) );
}
// ---------------------------------------------------------------------------
@@ -253,6 +316,7 @@
//
TInt CRadioEngineSettings::SetVolMuted( TBool aMuted )
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( AudioRoute() == RadioEngine::ERadioHeadset )
{
return SetHeadsetVolMuted( aMuted );
@@ -270,6 +334,7 @@
//
TBool CRadioEngineSettings::IsVolMuted() const
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( AudioRoute() == RadioEngine::ERadioHeadset )
{
return IsHeadsetVolMuted();
@@ -287,7 +352,8 @@
//
TInt CRadioEngineSettings::SetPowerOn( TBool aPowerState )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRVisualRadioPowerState, aPowerState );
+ LEVEL3( LOG_METHOD_AUTO );
+ return SetFlagValue( KRadioCRRadioPowerState, EPowerOn, aPowerState );
}
// ---------------------------------------------------------------------------
@@ -297,7 +363,8 @@
//
TBool CRadioEngineSettings::IsPowerOn() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRVisualRadioPowerState );
+ LEVEL3( LOG_METHOD_AUTO );
+ return NormalizeBool( iFlags.IsSet( EPowerOn ) );
}
// ---------------------------------------------------------------------------
@@ -307,8 +374,13 @@
//
TInt CRadioEngineSettings::SetTunedFrequency( TUint32 aFrequency )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid,
- KRadioCRTunedFrequency, static_cast<TInt>( aFrequency ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ TInt err = iRepository->Set( KRadioCRTunedFrequency, static_cast<TInt>( aFrequency ) );
+ if ( !err )
+ {
+ iFrequency = aFrequency;
+ }
+ return err;
}
// ---------------------------------------------------------------------------
@@ -318,7 +390,8 @@
//
TUint32 CRadioEngineSettings::TunedFrequency() const
{
- return static_cast<TUint32>( iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRTunedFrequency ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iFrequency;
}
// ---------------------------------------------------------------------------
@@ -328,7 +401,8 @@
//
TInt CRadioEngineSettings::DefaultMinVolumeLevel() const
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRDefaultMinVolumeLevel );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iDefaultMinVolume;
}
// ---------------------------------------------------------------------------
@@ -338,6 +412,7 @@
//
TInt CRadioEngineSettings::CountRegions() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iRegions.Count();
}
@@ -348,6 +423,7 @@
//
CRadioRegion& CRadioEngineSettings::Region( TInt aIndex ) const
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( aIndex == KErrNotFound )
{
aIndex = RegionIndexForId( DefaultRegion() );
@@ -363,8 +439,8 @@
//
TRadioRegion CRadioEngineSettings::RegionId() const
{
- return static_cast<TRadioRegion>( iRepositoryManager.EntityValueInt( KRadioCRUid,
- KRadioCRCurrentRegion ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ return iRegionId;
}
// ---------------------------------------------------------------------------
@@ -374,20 +450,10 @@
//
TRadioRegion CRadioEngineSettings::DefaultRegion() const
{
- TInt region( 0 );
-
- TRAPD( err, iRepositoryManager.GetRepositoryValueL( KRadioCRUid, KRadioCRDefaultRegion, region ) );
-
- TRadioRegion regionSetting = static_cast<TRadioRegion>( region );
-
- if ( err != KErrNone )
- {
- regionSetting = ERadioRegionNone;
- }
- return regionSetting;
+ LEVEL3( LOG_METHOD_AUTO );
+ return iDefaultRegion;
}
-
// ---------------------------------------------------------------------------
// From class MRadioEngineSettings.
//
@@ -395,17 +461,8 @@
//
TPtrC CRadioEngineSettings::NetworkId() const
{
- return TPtrC( iRepositoryManager.EntityValueDes16( KRadioCRUid, KRadioCRNetworkId ) );
- }
-
-// ---------------------------------------------------------------------------
-// From class MRadioEngineSettings.
-//
-// ---------------------------------------------------------------------------
-//
-TPtrC CRadioEngineSettings::SubscriberId() const
- {
- return TPtrC( iRepositoryManager.EntityValueDes16( KRadioCRUid, KRadioCRSubscriberId ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ return TPtrC( iNetworkId );
}
// ---------------------------------------------------------------------------
@@ -415,7 +472,8 @@
//
TPtrC CRadioEngineSettings::CountryCode() const
{
- return TPtrC( iRepositoryManager.EntityValueDes16( KRadioCRUid, KRadioCRCountryCode ) );
+ LEVEL3( LOG_METHOD_AUTO );
+ return TPtrC( iCountryCode );
}
// ---------------------------------------------------------------------------
@@ -425,12 +483,14 @@
//
TInt CRadioEngineSettings::SetRegionId( TInt aRegion )
{
+ LEVEL3( LOG_METHOD_AUTO );
__ASSERT_ALWAYS( RegionIndexForId( aRegion ) != KErrNotFound,
User::Panic( _L( "CRadioEngineSettings" ), KErrArgument ) );
- TInt err = iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRCurrentRegion, aRegion );
+ TInt err = iRepository->Set( KRadioCRCurrentRegion, aRegion );
if ( !err )
{
+ iRegionId = static_cast<TRadioRegion>( aRegion );
UpdateCurrentRegionIdx( aRegion );
err = SetTunedFrequency( Region( iCurrentRegionIdx ).MinFrequency() );
}
@@ -442,29 +502,11 @@
//
// ---------------------------------------------------------------------------
//
-TInt CRadioEngineSettings::SetRdsAfSearch( TBool aEnabled )
- {
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRRdsAfSearch, aEnabled );
- }
-
-// ---------------------------------------------------------------------------
-// From class MRadioSettingsSetter.
-//
-// ---------------------------------------------------------------------------
-//
TInt CRadioEngineSettings::SetNetworkId( const TDesC& aNetworkId )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRNetworkId, aNetworkId );
- }
-
-// ---------------------------------------------------------------------------
-// From class MRadioSettingsSetter.
-//
-// ---------------------------------------------------------------------------
-//
-TInt CRadioEngineSettings::SetSubscriberId( const TDesC& aSubscriberId )
- {
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRSubscriberId, aSubscriberId );
+ LEVEL3( LOG_METHOD_AUTO );
+ iNetworkId.Copy( aNetworkId.Left( iNetworkId.MaxLength() ) );
+ return iRepository->Set( KRadioCRNetworkId, iNetworkId );
}
// ---------------------------------------------------------------------------
@@ -474,7 +516,9 @@
//
TInt CRadioEngineSettings::SetCountryCode( const TDesC& aCountryCode )
{
- return iRepositoryManager.SetEntityValue( KRadioCRUid, KRadioCRCountryCode, aCountryCode );
+ LEVEL3( LOG_METHOD_AUTO );
+ iCountryCode.Copy( aCountryCode.Left( iCountryCode.MaxLength() ) );
+ return iRepository->Set( KRadioCRCountryCode, iCountryCode );
}
// ---------------------------------------------------------------------------
@@ -484,6 +528,7 @@
//
TUint32 CRadioEngineSettings::FrequencyStepSize() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return Region( iCurrentRegionIdx ).StepSize();
}
@@ -494,6 +539,7 @@
//
TUint32 CRadioEngineSettings::MaxFrequency() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return Region( iCurrentRegionIdx ).MaxFrequency();
}
@@ -504,6 +550,7 @@
//
TUint32 CRadioEngineSettings::MinFrequency() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return Region( iCurrentRegionIdx ).MinFrequency();
}
@@ -514,17 +561,101 @@
//
TInt CRadioEngineSettings::DecimalCount() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return Region( iCurrentRegionIdx ).DecimalCount();
}
// ---------------------------------------------------------------------------
-// From class MRadioEngineSettings.
-//
+// Initializes the data holders
// ---------------------------------------------------------------------------
//
-TBool CRadioEngineSettings::RdsAfSearchEnabled() const
+void CRadioEngineSettings::InitializeDataHolders()
{
- return iRepositoryManager.EntityValueInt( KRadioCRUid, KRadioCRRdsAfSearch );
+ TInt temp = 0;
+ GetRepositoryValue( KRadioCRHeadsetMuteState, temp, EFalse );
+ iFlags.Assign( EHeadsetVolMuted, temp );
+
+ temp = RadioEngine::ERadioHeadsetDefaultVolume;
+ GetRepositoryValue( KRadioCRHeadsetVolume, temp, temp );
+ iHeadsetVolume = temp;
+
+ temp = 0;
+ GetRepositoryValue( KRadioCRSpeakerMuteState, temp, EFalse );
+ iFlags.Assign( ESpeakerVolMuted, temp );
+
+ temp = RadioEngine::ERadioSpeakerDefaultVolume;
+ GetRepositoryValue( KRadioCRSpeakerVolume, temp, temp );
+ iSpeakerVolume = temp;
+
+ temp = 0;
+ GetRepositoryValue( KRadioCRRadioPowerState, temp, EFalse );
+ iFlags.Assign( EPowerOn, temp );
+
+ temp = RadioEngine::ERadioStereo;
+ if ( GetRepositoryValue( KRadioCROutputMode, temp, temp ) )
+ {
+ iFlags.Assign( EStereoOutput, temp == RadioEngine::ERadioStereo );
+ }
+
+ temp = RadioEngine::ERadioHeadset;
+ if ( GetRepositoryValue( KRadioCRAudioRoute, temp, temp ) )
+ {
+ iFlags.Assign( EHeadsetAudioRoute, temp == RadioEngine::ERadioHeadset );
+ }
+
+ temp = RadioEngine::ERadioDefaultMinVolume;
+ GetRepositoryValue( KRadioCRDefaultMinVolumeLevel, temp, temp );
+ iDefaultMinVolume = temp;
+
+ temp = ERadioRegionNone;
+ GetRepositoryValue( KRadioCRDefaultRegion, temp, temp );
+ iDefaultRegion = static_cast<TRadioRegion>( temp );
+
+ temp = ERadioRegionNone;
+ GetRepositoryValue( KRadioCRCurrentRegion, temp, temp );
+ iRegionId = static_cast<TRadioRegion>( temp );
+
+ temp = MinFrequency();
+ GetRepositoryValue( KRadioCRTunedFrequency, temp, temp );
+ iFrequency = static_cast<TUint32>( temp );
+ }
+
+// ---------------------------------------------------------------------------
+// Gets a repository value and sets the default value if the key is not found
+// ---------------------------------------------------------------------------
+//
+TBool CRadioEngineSettings::GetRepositoryValue( int aKey, TInt& aValue, TInt aDefault )
+ {
+ TInt temp = 0;
+ TInt err = iRepository->Get( aKey, temp );
+ if ( !err )
+ {
+ aValue = temp;
+ return ETrue;
+ }
+ else if ( err == KErrNotFound )
+ {
+ if ( iRepository->Set( aKey, aDefault ) == KErrNone )
+ {
+ aValue = aDefault;
+ return ETrue;
+ }
+ }
+ return EFalse;
+ }
+
+// ---------------------------------------------------------------------------
+// Sets a boolean value to cenrep and data holder
+// ---------------------------------------------------------------------------
+//
+TInt CRadioEngineSettings::SetFlagValue( int aKey, int aFlagId, TInt aValue )
+ {
+ TInt err = iRepository->Set( aKey, aValue );
+ if ( !err )
+ {
+ iFlags.Assign( aFlagId, aValue );
+ }
+ return err;
}
// ---------------------------------------------------------------------------
@@ -533,18 +664,33 @@
//
void CRadioEngineSettings::InitializeRegionsL()
{
+ LEVEL3( LOG_METHOD_AUTO );
iRegions.ResetAndDestroy();
TResourceReader reader;
- iCoeEnv.CreateResourceReaderLC( reader, R_QRAD_REGIONS );
+
+ TFileName resourceFileName;
+ resourceFileName.Append( KRadioSettingsResourceFile );
+
+ //User::LeaveIfError( iRadioSettingsImp.FsSession().Connect() );
+ iRadioSettingsImp.ResolveDriveL( resourceFileName, KDC_RESOURCE_FILES_DIR );
+ BaflUtils::NearestLanguageFile( iRadioSettingsImp.FsSession(), resourceFileName);
+
+ iResFile.OpenL( iRadioSettingsImp.FsSession(), resourceFileName);
+
+ iResFile.ConfirmSignatureL();
+ HBufC8* readBuffer = iResFile.AllocReadLC(R_QRAD_REGIONS);
+ reader.SetBuffer(readBuffer);
TInt regionCount = reader.ReadInt16();
for ( TInt i = 0 ; i < regionCount; i++ )
{
TInt resId = reader.ReadInt32(); // The next resource ID to read.
+ HBufC8* regionBuffer = iResFile.AllocReadLC(resId);
TResourceReader regionReader;
- iCoeEnv.CreateResourceReaderLC( regionReader, resId );
+ regionReader.SetBuffer(regionBuffer);
+
CRadioRegion* region = CRadioRegion::NewL( regionReader );
CleanupStack::PushL( region );
@@ -556,17 +702,16 @@
else{
CleanupStack::PopAndDestroy( region );
}
- CleanupStack::PopAndDestroy();
+ CleanupStack::PopAndDestroy(regionBuffer);
}
- CleanupStack::PopAndDestroy();
-
if ( CountRegions() <= 0 || !IsRegionAllowed( DefaultRegion() ) )
{
User::Leave( KErrCorrupt );
}
UpdateCurrentRegionIdx( RegionId() );
+ CleanupStack::PopAndDestroy(readBuffer);
}
// ---------------------------------------------------------------------------
@@ -575,6 +720,7 @@
//
TInt CRadioEngineSettings::RegionIndexForId( TInt aRegionId ) const
{
+ LEVEL3( LOG_METHOD_AUTO );
TInt idx = KErrNotFound;
for ( TInt i = 0 ; i < CountRegions(); ++i )
{
@@ -593,76 +739,28 @@
//
void CRadioEngineSettings::UpdateCurrentRegionIdx( TInt aRegionId )
{
+ LEVEL3( LOG_METHOD_AUTO );
iCurrentRegionIdx = RegionIndexForId( aRegionId );
}
// ---------------------------------------------------------------------------
-// From class MRadioRepositoryEntityObserver.
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineSettings::HandleRepositoryValueChangeL( const TUid& aUid,
- TUint32 aKey,
- TInt aValue,
- TInt aError )
- {
- if ( !aError && aUid == KRadioCRUid && iObserver )
- {
- if ( aKey == KRadioCRRdsAfSearch )
- {
- iObserver->RdsAfSearchSettingChangedL( aValue );
- }
- else if ( aKey == KRadioCRCurrentRegion )
- {
- if ( iCurrentRegionIdx != RegionIndexForId( aValue ) )
- {
- UpdateCurrentRegionIdx( aValue );
- __ASSERT_ALWAYS( iCurrentRegionIdx != KErrNotFound,
- User::Panic( _L( "CRadioEngineSettings" ), KErrArgument ) );
- User::LeaveIfError( SetTunedFrequency( Region( iCurrentRegionIdx ).MinFrequency() ) );
- iObserver->RegionSettingChangedL( aValue );
- }
- }
- else if ( aKey == KRadioCRRdsAfSearch )
- {
- iObserver->RdsAfSearchSettingChangedL( aValue );
- }
- else
- {
- }
- }
- }
-
-// ---------------------------------------------------------------------------
// Determines if region is allowed .
// ---------------------------------------------------------------------------
//
TBool CRadioEngineSettings::IsRegionAllowed( TRadioRegion aRegionId ) const
{
-
- TInt regionAllowed( EFalse );
- TInt err( KErrNone );
-
- switch ( aRegionId )
- {
- case ERadioRegionJapan:
- TRAP( err, iRepositoryManager.GetRepositoryValueL( KRadioCRUid, KRadioCRRegionAllowedJapan, regionAllowed ) );
- break;
+ LEVEL3( LOG_METHOD_AUTO );
- case ERadioRegionAmerica:
- TRAP( err, iRepositoryManager.GetRepositoryValueL( KRadioCRUid, KRadioCRRegionAllowedAmerica, regionAllowed ) );
- break;
-
- case ERadioRegionDefault:
- TRAP( err, iRepositoryManager.GetRepositoryValueL( KRadioCRUid, KRadioCRRegionAllowedDefault, regionAllowed ) );
- break;
-
- default:
- break;
- }
-
- if ( err != KErrNone )
+ TInt regionAllowed( ETrue );
+ if ( ERadioRegionJapan == aRegionId )
{
- regionAllowed = EFalse;
+ TInt err = iRepository->Get( KRadioCRRegionAllowedJapan, regionAllowed );
+ if ( KErrNone != err )
+ {
+ // In case the key is not found or otherwise unsuccessfully read,
+ // Japan region is not allowed by default.
+ regionAllowed = EFalse;
+ }
}
return TBool( regionAllowed );
--- a/radioengine/settings/src/cradioregion.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/src/cradioregion.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -20,6 +20,7 @@
// User includes
#include "cradioregion.h"
+#include "cradioenginelogger.h"
// Used to convert kilohertz values to hertz values
const TInt KRadioThousand = 1000;
@@ -32,6 +33,7 @@
//
CRadioRegion::CRadioRegion()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -40,6 +42,7 @@
//
void CRadioRegion::ConstructL( TResourceReader& aRr )
{
+ LEVEL3( LOG_METHOD_AUTO );
iId = static_cast<TRadioRegion>( aRr.ReadUint16());
iStepSize = static_cast<TUint16>( aRr.ReadUint16() ) * KRadioThousand;
iMinFreq = aRr.ReadUint32() * KRadioThousand;
@@ -64,6 +67,7 @@
//
CRadioRegion* CRadioRegion::NewL( TResourceReader& aRr )
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioRegion* self = new ( ELeave ) CRadioRegion;
CleanupStack::PushL( self );
@@ -80,6 +84,7 @@
//
CRadioRegion::~CRadioRegion()
{
+ LEVEL3( LOG_METHOD_AUTO );
iCountryCodes.ResetAndDestroy();
iCountryCodes.Close();
delete iName;
@@ -92,6 +97,7 @@
//
EXPORT_C TRadioRegion CRadioRegion::Id() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iId;
}
@@ -101,6 +107,7 @@
//
EXPORT_C TUint32 CRadioRegion::StepSize() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iStepSize;
}
@@ -110,6 +117,7 @@
//
EXPORT_C TUint32 CRadioRegion::MinFrequency() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iMinFreq;
}
@@ -119,6 +127,7 @@
//
EXPORT_C TUint32 CRadioRegion::MaxFrequency() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iMaxFreq;
}
@@ -128,6 +137,7 @@
//
EXPORT_C TInt CRadioRegion::DecimalCount() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iDecimalCount;
}
@@ -137,6 +147,7 @@
//
EXPORT_C const RRadioCountryCodeArray& CRadioRegion::CountryCodes()
{
+ LEVEL3( LOG_METHOD_AUTO );
return iCountryCodes;
}
@@ -146,6 +157,7 @@
//
EXPORT_C const TDesC16& CRadioRegion::Name() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iName;
}
@@ -155,5 +167,6 @@
//
EXPORT_C const TDesC16& CRadioRegion::SettingItemName() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iSettingName;
}
--- a/radioengine/settings/src/cradiosettings.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/src/cradiosettings.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -18,6 +18,7 @@
// User includes
#include "cradiosettings.h"
#include "cradiosettingsimp.h"
+#include "cradioenginelogger.h"
// ======== MEMBER FUNCTIONS ========
@@ -25,15 +26,17 @@
//
// ---------------------------------------------------------------------------
//
-EXPORT_C CRadioSettings* CRadioSettings::NewL( CCoeEnv* aCoeEnv )
-{
- return CRadioSettingsImp::NewL( aCoeEnv );
-}
+EXPORT_C CRadioSettings* CRadioSettings::NewL()
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ return CRadioSettingsImp::NewL();
+ }
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
EXPORT_C CRadioSettings::~CRadioSettings()
-{
-}
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ }
--- a/radioengine/settings/src/cradiosettingsbase.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +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 <s32mem.h>
-
-// User includes
-#include "cradiorepositorymanager.h"
-#include "cradiosettingsbase.h"
-#include "cradioenginelogger.h"
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioSettingsBase::CRadioSettingsBase( CRadioRepositoryManager& aRepositoryManager,
- CCoeEnv& aCoeEnv )
- : iCoeEnv( aCoeEnv )
- , iRepositoryManager( aRepositoryManager )
- {
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioSettingsBase::~CRadioSettingsBase()
- {
- }
-
-// ---------------------------------------------------------------------------
-// Writes a desciptor array to the repository.
-// ---------------------------------------------------------------------------
-//
-void CRadioSettingsBase::WriteArrayEntityL( const TUid& aUid, TUint32 aKey, const CDesCArray& aArray )
- {
- LOG_FORMAT( "CRadioSettingsBase::WriteArrayEntityL( aUid = %d, aKey = %d )", aUid.iUid, aKey );
-
- CBufFlat* buf = CBufFlat::NewL( KRadioEntityBuf8Length );
- CleanupStack::PushL( buf );
- RBufWriteStream stream( *buf );
- CleanupClosePushL( stream );
-
- TInt count = aArray.MdcaCount();
- stream << TCardinality( count );
-
- LOG_FORMAT( " count = %d", count );
-
- for ( TInt i = 0; i < count; i++ )
- {
- DEBUGVAR( TPtrC ptr( aArray.MdcaPoint( i ) ) );
- LOG_FORMAT( " entry %d: %S", i, &ptr );
- stream << aArray.MdcaPoint( i );
- }
-
- stream.CommitL();
-
- CleanupStack::PopAndDestroy( &stream );
-
- TRadioEntityBuf8 entityBuf( buf->Ptr( 0 ).Left( KRadioEntityBuf8Length ) );
- User::LeaveIfError( iRepositoryManager.SetEntityValue( aUid, aKey, entityBuf ) );
-
- CleanupStack::PopAndDestroy( buf );
- }
-
-// ---------------------------------------------------------------------------
-// Reads a descriptor array from the repository.
-// ---------------------------------------------------------------------------
-//
-CDesCArray* CRadioSettingsBase::ReadArrayEntityL( const TUid& aUid, TUint32 aKey ) const
- {
- LOG_FORMAT( "CRadioSettingsBase::ReadArrayEntityL( aUid = %d, aKey = %d )", aUid.iUid, aKey );
-
- CBufFlat* buf = CBufFlat::NewL( KRadioEntityBuf8Length );
- CleanupStack::PushL( buf );
- buf->InsertL( 0, iRepositoryManager.EntityValueDes8( aUid, aKey ) );
- RBufReadStream stream( *buf );
- CleanupClosePushL( stream );
-
- TCardinality count;
- stream >> count;
-
- LOG_FORMAT( " count = %d", static_cast<TInt>( count ) );
-
- CDesCArray* array = new ( ELeave ) CDesCArrayFlat( Max( static_cast<TInt>( count ), 1 ) );
- CleanupStack::PushL( array );
-
- for ( TInt i = 0; i < count; i++ )
- {
- HBufC* curBuf = HBufC::NewLC( stream, KMaxTInt );
- DEBUGVAR( TPtrC ptr( *curBuf ) );
- LOG_FORMAT( " entry %d: %S", i, &ptr );
- array->AppendL( *curBuf );
- CleanupStack::PopAndDestroy( curBuf );
- }
-
- CleanupStack::Pop( array );
- CleanupStack::PopAndDestroy( 2, buf );
-
- return array;
- }
--- a/radioengine/settings/src/cradiosettingsimp.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/settings/src/cradiosettingsimp.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -26,16 +26,9 @@
#include "cradiosettingsimp.h"
#include "cradioapplicationsettings.h"
#include "cradioenginesettings.h"
-#include "cradiorepositorymanager.h"
-#include "radioengineutils.h"
-#include "radioengineutils.h"
+//#include "radioengineutils.h"
#include "cradioenginelogger.h"
-// The name of the radio settings resource file.
-_LIT( KRadioSettingsResourceFile, "radioenginesettings.rsc" );
-
-// The granularity of the repository manager array.
-const TInt KRadioSettingsRepositoryManagerGranularity = 8;
// ======== MEMBER FUNCTIONS ========
@@ -43,11 +36,12 @@
//
// ---------------------------------------------------------------------------
//
-CRadioSettingsImp* CRadioSettingsImp::NewL( CCoeEnv* aCoeEnv )
+CRadioSettingsImp* CRadioSettingsImp::NewL()
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioSettingsImp* self = new (ELeave) CRadioSettingsImp;
CleanupStack::PushL( self );
- self->ConstructL( aCoeEnv );
+ self->ConstructL();
CleanupStack::Pop( self );
return self;
}
@@ -56,16 +50,15 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioSettingsImp::ConstructL( CCoeEnv* aCoeEnv )
+void CRadioSettingsImp::ConstructL()
{
- RadioEngineUtils::InitializeL( aCoeEnv );
- LoadResourcesL();
-
- iRepositoryManager = CRadioRepositoryManager::NewL( KRadioSettingsRepositoryManagerGranularity );
+ LEVEL3( LOG_METHOD_AUTO );
+ iFsSession = new ( ELeave ) RFs;
+ User::LeaveIfError( iFsSession->Connect() );
// Constructs the implementors of the interfaces.
- iApplicationSettings = CRadioApplicationSettings::NewL( *iRepositoryManager, *RadioEngineUtils::Env() );
- iEngineSettings = CRadioEngineSettings::NewL( *iRepositoryManager, *RadioEngineUtils::Env() );
+ iApplicationSettings = CRadioApplicationSettings::NewL();
+ iEngineSettings = CRadioEngineSettings::NewL( *this );
}
// ---------------------------------------------------------------------------
@@ -74,6 +67,7 @@
//
CRadioSettingsImp::CRadioSettingsImp()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -82,16 +76,17 @@
//
CRadioSettingsImp::~CRadioSettingsImp()
{
- delete iApplicationSettings;
+ LEVEL3( LOG_METHOD_AUTO );
delete iEngineSettings;
- delete iRepositoryManager;
-
- if ( iResourceLoader )
+ delete iApplicationSettings;
+ if ( iFsSession )
{
- iResourceLoader->Close();
+ if ( iFsSession->Handle() )
+ {
+ iFsSession->Close();
+ }
+ delete iFsSession;
}
- delete iResourceLoader;
- RadioEngineUtils::Release();
}
// ---------------------------------------------------------------------------
@@ -100,6 +95,7 @@
//
TBool CRadioSettingsImp::IsRegionAllowed( TRadioRegion aRegionId ) const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iEngineSettings->IsRegionAllowed( aRegionId );
}
@@ -109,6 +105,7 @@
//
MRadioApplicationSettings& CRadioSettingsImp::ApplicationSettings() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iApplicationSettings;
}
@@ -118,6 +115,7 @@
//
MRadioEngineSettings& CRadioSettingsImp::EngineSettings() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iEngineSettings;
}
@@ -127,30 +125,22 @@
//
MRadioSettingsSetter& CRadioSettingsImp::RadioSetter() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iEngineSettings;
}
// ---------------------------------------------------------------------------
-// Returns the underlying repository.
-// ---------------------------------------------------------------------------
-//
-CRadioRepositoryManager& CRadioSettingsImp::Repository() const
- {
- return *iRepositoryManager;
- }
-
-// ---------------------------------------------------------------------------
// Static version of ResolveDriveL.
// ---------------------------------------------------------------------------
//
void CRadioSettingsImp::ResolveDriveL( TFileName& aFileName, const TDesC& aPath )
{
- LOG_FORMAT( "CRadioSettingsImp::ResolveDriveL( aFileName = %S, aPath = %S )", &aFileName, &aPath );
-
- RFs& fsSession = RadioEngineUtils::FsSession();
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aFileName = %S, aPath = %S", &aFileName, &aPath ) );
+
TFileName fileName;
TFileName baseResource;
- TFindFile finder( fsSession );
+ TFindFile finder( *iFsSession );
TLanguage language( ELangNone );
_LIT( resourceFileExt, ".rsc" );
@@ -175,24 +165,24 @@
err = finder.FindByDir( aFileName, aPath );
}
- LOG_FORMAT( "CRadioSettingsImp::ResolveDriveL - err = %d", err );
+ LEVEL3( LOG_FORMAT( "err = %d", err ) );
TBool found = EFalse;
- if ( !isResourceFile && err == KErrNone )
+ if ( !isResourceFile && ( KErrNone == err ) )
{
found = ETrue;
aFileName.Zero();
aFileName.Append( finder.File() );
}
- while ( !found && err == KErrNone && isResourceFile )
+ while ( !found && ( KErrNone == err ) && isResourceFile )
{
// Found file
fileName.Zero();
TParsePtrC foundPath( finder.File() );
fileName.Copy( foundPath.DriveAndPath() );
fileName.Append( aFileName );
- BaflUtils::NearestLanguageFile( fsSession, fileName, language );
- if ( language != ELangNone && BaflUtils::FileExists( fsSession, fileName ) )
+ BaflUtils::NearestLanguageFile( *iFsSession, fileName, language );
+ if ( language != ELangNone && BaflUtils::FileExists( *iFsSession, fileName ) )
{
found = ETrue;
aFileName.Zero();
@@ -202,7 +192,7 @@
{
if ( language == ELangNone &&
!baseResource.Compare( KNullDesC ) &&
- BaflUtils::FileExists( fsSession, fileName ) )
+ BaflUtils::FileExists( *iFsSession, fileName ) )
{
baseResource.Copy( fileName );
}
@@ -215,7 +205,7 @@
if ( !found && baseResource.Compare( KNullDesC ) )
{
// If we found *.rsc then better to use that than nothing
- if ( BaflUtils::FileExists( fsSession, baseResource ) )
+ if ( BaflUtils::FileExists( *iFsSession, baseResource ) )
{
found = ETrue;
aFileName.Zero();
@@ -225,29 +215,24 @@
if ( !found )
{
- LOG_FORMAT( "CRadioSettingsImp::ResolveDriveL - File %S not found ( err = %d )!", &aFileName, err );
- User::Leave( KErrNotFound );
+ LEVEL3( LOG_FORMAT( "File %S not found ( err = %d )!", &aFileName, err ) );
+ if ( !err )
+ {
+ err = KErrNotFound;
+ }
+ User::Leave( err );
}
- LOG_FORMAT( "CRadioSettingsImp::ResolveDriveL( aFileName = %S )", &aFileName );
+ LEVEL3( LOG_FORMAT( "aFileName = %S", &aFileName ) );
}
// ---------------------------------------------------------------------------
-// Loads the required resources.
+// Returns the file server session
// ---------------------------------------------------------------------------
//
-void CRadioSettingsImp::LoadResourcesL()
+RFs& CRadioSettingsImp::FsSession()
{
- // Allocated in heap only so that the resource loader header doesn't need to be
- // included in the header of this class. This is because this will be included
- // by a QT component that should not depend on CONE
- iResourceLoader = new (ELeave) RConeResourceLoader( *RadioEngineUtils::Env() );
-
- TFileName resourceFileName;
- resourceFileName.Append( KRadioSettingsResourceFile );
-
- ResolveDriveL( resourceFileName, KDC_RESOURCE_FILES_DIR );
-
- iResourceLoader->OpenL( resourceFileName );
+ LEVEL3( LOG_METHOD_AUTO );
+ return *iFsSession;
}
--- a/radioengine/utils/api/cradioenginelogger.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/cradioenginelogger.h Fri Jun 11 13:38:32 2010 +0300
@@ -32,9 +32,45 @@
#define LOGGING_ENABLED
#endif
+#define LOGGING_LEVEL 1
+
+/**
+ * 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
+
#ifdef LOGGING_ENABLED
/**
+ * Debug var macros for all logging levels
+ */
+#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
+
+/**
* Log file path.
* If the path points to memory card and the card is not present or is read only,
* the log is written to C: drive.
@@ -132,8 +168,6 @@
*/
#define LOG_ASSERT( expr, stmt ) do { if ( !( expr )) { stmt; } }while( 0 )
-#define DEBUGVAR( var ) var
-
/**
* Writes a formatted string to log. Accepts variable number of parameters
*
@@ -250,7 +284,6 @@
//#define LOG4( x1, x2, x3, x4 ) do{CRadioEngineLogger::Logger()->AddIndent().Add( x1 ).Add( x2 ).Add( x3 ).Add( x4 ).Commit();}while( 0 )
//#define LOG5( x1, x2, x3, x4, x5 ) do{CRadioEngineLogger::Logger()->AddIndent().Add( x1 ).Add( x2 ).Add( x3 ).Add( x4 ).Add( x5 ).Commit();}while( 0 )
-
// ===========================================================================
// ===========================================================================
//
@@ -425,6 +458,8 @@
#define LOG_FORMAT( fmt,args...)
#define LOG_ASSERT( expr, stmt )
#define DEBUGVAR( var )
+#define DEBUGVAR2( var )
+#define DEBUGVAR3( var )
#define LOG_CURRENT_TIME()
#define LOG_TIME( x )
--- a/radioengine/utils/api/cradiopubsub.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +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 CRADIOPUBSUB_H
-#define CRADIOPUBSUB_H
-
-#include <e32base.h>
-
-#include "radiointernalpskeys.h"
-
-class MRadioControlEventObserver;
-
-/**
- * Publish&Subscribe interface of Visual Radio Application.
- */
-NONSHARABLE_CLASS( CRadioPubSub ) : public CBase
- {
-public:
-
- IMPORT_C static CRadioPubSub* NewL();
-
- IMPORT_C virtual ~CRadioPubSub();
-
- /**
- * Publishes active channel number to P&S.
- *
- * @param aChannelId The channel ID to publish.
- */
- virtual TBool PublishChannel( TInt aChannelId ) const = 0;
-
- /**
- * Publishes active frequency to P&S.
- *
- * @param aFreq The frequency to publish.
- */
- virtual TBool PublishFrequency( TUint32 aFreq ) const = 0;
-
- /**
- * Publishes radio power state to P&S.
- *
- * @param aPowerOn The radio power state to publish.
- */
- virtual TBool PublishPowerState( TBool aPowerOn ) const = 0;
-
- /**
- * Publishes current volume level to P&S.
- *
- * @param aVol The current volume level to publish.
- */
- virtual TBool PublishVolume( TInt aVol ) const = 0;
-
- /**
- * Publishes changed channel number to P&S.
- *
- * @param aChannelId The channel ID to publish.
- */
- virtual TBool PublishChannelDataChanged( TInt aChannelId ) const = 0;
-
- /**
- * Publishes the tuning state to P&S.
- * @param aTuningState The tuning state to publish.
- */
- virtual TBool PublishTuningState( TRadioPSTuningState aTuningState ) const = 0;
-
- /**
- * Publishes radio mute state to P&S.
- *
- * @param aMuted The radio mute state to publish.
- */
- virtual TBool PublishRadioMuteState( TBool aMuted ) const = 0;
-
- /**
- * Publishes application running state to P&S.
- *
- * @param aRunningState The application running state.
- */
- virtual TBool PublishApplicationRunningState( TRadioPSApplicationRunningState aRunningState ) const = 0;
-
- /**
- * Publishes the headset status to P&S.
- *
- * @param aHeadsetStatus The headset's status.
- */
- virtual TBool PublishHeadsetStatus( TRadioPSHeadsetStatus aHeadsetStatus ) const = 0;
-
- /**
- * Publishes the frequency decimal count to P&S.
- * @param aDecimalCount The decimal count.
- */
- virtual TBool PublishFrequencyDecimalCount( TRadioPSFrequencyDecimalCount aDecimalCount ) const = 0;
-
- /**
- * Publishes speaker status. Before state is set for first time it is in
- * <code>ERadioPSSpeakerUninitialized</code> state.
- *
- * @param aLoudspeakerStatus Status of the speaker
- */
- virtual TBool PublishLoudspeakerStatus( TRadioPSLoudspeakerStatus aLoudspeakerStatus ) const = 0;
-
- /**
- * Publishes Rds Program Service information.
- *
- * @param aProgramService Rds Program service descriptor
- */
- virtual TBool PublishRdsProgramService( const TDesC& aProgramService ) const = 0;
-
- /**
- * Publishes Rds Radio Text information.
- *
- * @param aRadioText The Radio Text information to be published.
- */
- virtual TBool PublishRdsRadioText( const TDesC& aRadioText ) const = 0;
-
- /**
- * Publishes Channel name information.
- *
- * @param aName The name to be published.
- */
- virtual TBool PublishChannelName( const TDesC& aName ) const = 0;
-
- /**
- * Publishes the number of presets in the active preset list.
- *
- * @param aCount The number of presets.
- */
- virtual TBool PublishActivePreseListCount( TInt aCount ) const = 0;
-
- /**
- * Publishes the focus in the active preset list.
- *
- * @param aIndex The focus in the active preset list.
- */
- virtual TBool PublishActivePreseListFocus( TInt aIndex ) const = 0;
-
- /**
- * Publishes the antenna state ( attach/detach ).
- *
- * @param aState The current antenna state.
- */
- virtual TBool PublishAntennaState( TRadioPSRadioAntennaState aState ) const = 0;
-
- /**
- * Sets the UI side control event observer.
- * @param aControlEventObserver the observer for control events
- */
- virtual void SetControlEventObserver( MRadioControlEventObserver* aControlEventObserver ) = 0;
-
- };
-
-#endif // CRADIOPUBSUB_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/api/cradiorepositoryentity.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,94 @@
+/*
+* 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 C_RADIOREPOSITORYENTITY_H
+#define C_RADIOREPOSITORYENTITY_H
+
+// User includes
+#include "cradiorepositoryentitybase.h"
+#include "mradiorepositoryentityobserver.h"
+#include "cradioenginelogger.h"
+
+// Forward declarations
+class CRepository;
+
+/**
+ * Templated class to listen to a single key within the central repository.
+ *
+ * Notifies the observer of changes in the key, and provides caching for the key's value.
+ */
+template <typename T>
+NONSHARABLE_CLASS( CRadioRepositoryEntity ) : public CRadioRepositoryEntityBase
+ {
+
+public:
+
+ IMPORT_C static CRadioRepositoryEntity<T>* NewL( const TUid& aUid,
+ TUint32 aKey,
+ MRadioRepositoryEntityObserver& aObserver,
+ CActive::TPriority aPriority = CActive::EPriorityStandard );
+
+ IMPORT_C ~CRadioRepositoryEntity();
+
+ /**
+ * Sets the value of the entity.
+ * The value is written into the central repository immediately.
+ *
+ * @param aValue The value to set.
+ * @param aSavingEnabled If ETrue, saving to central repository file is enabled
+ */
+ TInt SetValue( const T& aValue, TBool aSavingEnabled );
+
+ /**
+ * Returns a cached reference to the value of the entity.
+ *
+ * @return The cached value of the entity.
+ */
+ const T& Value() const;
+
+ /**
+ * Forcibly updates the key's value from the central repository and caches it.
+ */
+ void UpdateL();
+
+// from base class CActive
+
+ void RunL();
+ void DoCancel();
+
+private:
+
+ CRadioRepositoryEntity( const TUid& aUid,
+ TUint32 aKey,
+ MRadioRepositoryEntityObserver& aObserver,
+ CActive::TPriority aPriority );
+
+ void ConstructL();
+
+protected:
+
+ /** The central repository client. */
+ CRepository* iRepository;
+
+ /** The cached value of the key. */
+ T iValue;
+
+ };
+
+#include "cradiorepositoryentity.inl"
+
+#endif // C_RADIOREPOSITORYENTITY_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/api/cradiorepositoryentity.inl Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,143 @@
+/*
+* 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 <centralrepository.h>
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+EXPORT_C CRadioRepositoryEntity<T>* CRadioRepositoryEntity<T>::NewL( const TUid& aUid,
+ TUint32 aKey,
+ MRadioRepositoryEntityObserver& aObserver,
+ CActive::TPriority aPriority )
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ CRadioRepositoryEntity<T>* self = new ( ELeave ) CRadioRepositoryEntity<T>( aUid, aKey, aObserver, aPriority );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+CRadioRepositoryEntity<T>::CRadioRepositoryEntity( const TUid& aUid,
+ TUint32 aKey,
+ MRadioRepositoryEntityObserver& aObserver,
+ CActive::TPriority aPriority )
+ : CRadioRepositoryEntityBase( aUid, aKey, aObserver, aPriority )
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+void CRadioRepositoryEntity<T>::ConstructL()
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ iRepository = CRepository::NewL( iUid );
+
+ CActiveScheduler::Add( this );
+ iRepository->Get( iKey, iValue );
+ User::LeaveIfError( iRepository->NotifyRequest( iKey, iStatus ) );
+ SetActive();
+ }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+EXPORT_C CRadioRepositoryEntity<T>::~CRadioRepositoryEntity()
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ Cancel();
+ delete iRepository;
+ }
+
+// -----------------------------------------------------------------------------
+// Sets the value of the key.
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+TInt CRadioRepositoryEntity<T>::SetValue( const T& aValue, TBool aSavingEnabled )
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ iValue = aValue;
+ if ( aSavingEnabled )
+ {
+ return iRepository->Set( iKey, aValue );
+ }
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// Returns the cached copy of the key's value.
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+const T& CRadioRepositoryEntity<T>::Value() const
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ return iValue;
+ }
+
+// -----------------------------------------------------------------------------
+// Forcibly updates the cached value from the repository.
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+void CRadioRepositoryEntity<T>::UpdateL()
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ User::LeaveIfError( iRepository->Get( iKey, iValue ) );
+ }
+
+// -----------------------------------------------------------------------------
+// Executed when the key's value is changed.
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+void CRadioRepositoryEntity<T>::RunL()
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ User::LeaveIfError( iRepository->NotifyRequest( iKey, iStatus ) );
+ SetActive();
+
+ TInt err = iRepository->Get( iKey, iValue );
+ iObserver.HandleRepositoryValueChangeL( iUid, iKey, iValue, err );
+ }
+
+// -----------------------------------------------------------------------------
+// Cancels all pending notifications.
+// -----------------------------------------------------------------------------
+//
+template <typename T>
+void CRadioRepositoryEntity<T>::DoCancel()
+ {
+ LEVEL3( LOG_METHOD_AUTO );
+ iRepository->NotifyCancel( iKey );
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/api/cradiorepositoryentitybase.h Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,78 @@
+/*
+* 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 C_RADIOREPOSITORYENTITYBASE_H
+#define C_RADIOREPOSITORYENTITYBASE_H
+
+#include <e32base.h>
+
+class MRadioRepositoryEntityObserver;
+
+/**
+ * Base class for a central repository entity.
+ *
+ * All instantiable central repository entities must be derived from this class.
+ * The class is provided so that a heterogenous array of templated objects can be created, and to
+ * provide common data fields for the said purpose.
+ */
+class CRadioRepositoryEntityBase : public CActive
+ {
+
+public:
+
+ IMPORT_C ~CRadioRepositoryEntityBase();
+
+ /**
+ * Returns the UID of the repository the entity is bound to.
+ *
+ * @return The UID of the repository the entity is bound to.
+ */
+ const TUid& Uid() const;
+
+ /**
+ * Returns the key the entity is bound to.
+ *
+ * @return The key the entity is bound to.
+ */
+ TUint32 Key() const;
+
+protected:
+
+ /**
+ * Constructor.
+ *
+ * @param aUid The UID of the repository that this entity will be bound to.
+ * @param aKey The key within the repository that this entity will be bound to.
+ * @param aObserver The observer that is notified whenever the value of the key within the repository changes.
+ * @param aPriority The priority of the active object.
+ */
+ IMPORT_C CRadioRepositoryEntityBase( const TUid& aUid, TUint32 aKey, MRadioRepositoryEntityObserver& aObserver, CActive::TPriority aPriority );
+
+protected:
+
+ /** The observer that is notified of changes in the key. */
+ MRadioRepositoryEntityObserver& iObserver;
+
+ /** The UID of the repository the entity is bound to. */
+ TUid iUid;
+
+ /** The key the entity is bound to.. */
+ TUint32 iKey;
+
+ };
+
+#endif // C_RADIOREPOSITORYENTITYBASE_H
--- a/radioengine/utils/api/cradiosystemeventcollector.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/cradiosystemeventcollector.h Fri Jun 11 13:38:32 2010 +0300
@@ -79,13 +79,6 @@
*/
virtual TBool IsHeadsetConnectedL() const = 0;
- /**
- * Returns current Voice UI state.
- *
- * @return ETrue if Voice UI is active, EFalse otherwise
- */
- virtual TBool IsVoiceUiActive() const = 0;
-
};
#endif // CRADIOSYSTEMEVENTCOLLECTOR_H
--- a/radioengine/utils/api/mradiocontroleventobserver.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/mradiocontroleventobserver.h Fri Jun 11 13:38:32 2010 +0300
@@ -55,13 +55,6 @@
virtual void SeekL( RadioEngine::TRadioTuneDirection aDirection ) = 0;
/**
- * Called when "step to frequency up" request occurs.
- *
- * @param aDirection If ERadioUp steps up, otherwise steps down
- */
- virtual void StepToFrequencyL( RadioEngine::TRadioTuneDirection aDirection ) = 0;
-
- /**
* Called when "set frequency" request occurs.
*
* @param aFreq Frequency to set
--- a/radioengine/utils/api/radioenginedef.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/radioenginedef.h Fri Jun 11 13:38:32 2010 +0300
@@ -22,6 +22,28 @@
{
/**
+ * Headset volume.
+ */
+ enum TRadioHeadsetVolume
+ {
+ ERadioHeadsetDefaultVolume = 4 /**< Headset default volume. */
+ };
+
+ /**
+ * Speaker volume.
+ */
+ enum TRadioSpeakerVolume
+ {
+ ERadioSpeakerDefaultVolume = 4 /**< Speaker default volume. */
+ };
+
+ /** Minimum volume */
+ enum TRadioMinVolume
+ {
+ ERadioDefaultMinVolume = 1 /**< Default minimum volume. */
+ };
+
+ /**
* Output sources.
*/
enum TRadioAudioRoute
--- a/radioengine/utils/api/radioengineutils.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/radioengineutils.h Fri Jun 11 13:38:32 2010 +0300
@@ -36,20 +36,13 @@
public:
- IMPORT_C static void InitializeL( CCoeEnv* aCoeEnv = NULL );
+ IMPORT_C static void InitializeL();
IMPORT_C static void Release();
IMPORT_C static MRadioEngineLogger* Logger();
/**
- * Return the cone environment
- *
- * @return Pointer to CCoeEnv
- */
- IMPORT_C static CCoeEnv* Env();
-
- /**
* Returns the file server session
*
* @return Reference to file server session
--- a/radioengine/utils/api/radiointernalcrkeys.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/radiointernalcrkeys.h Fri Jun 11 13:38:32 2010 +0300
@@ -20,216 +20,67 @@
#include <e32cmn.h>
-/** The UID of the category we use. Must be the same as Visual Radio's UID3 ( SID ). */
-const TUid KRadioCRUid = { 0x101FF976 };
-
-/**
-* The service mode of Visual Radio.
-*
-* @see TVRCRServiceMode
-*/
-const TUint32 KRadioCRServiceMode = 0x00000000;
+/** The UID of the category we use. Must be the same as FM Radio's UID3 ( SID ). */
+const TUid KRadioCRUid = { 0x2002FF52 };
-/**
-* Possible Visual Radio service modes.
-*/
-enum TVRCRServiceMode
- {
- EVRCRServiceNone, /**< Visual Radio has neither SDS nor visual service enabled. */
- EVRCRServiceSds, /**< Visual Radio has SDS service enabled. */
- };
-
-/////////////////////////////////////////////////////////////////////////////////////
-// When adding a new key, add it also to CVRRepositoryManager::CheckRepositoryKeysL()
-// to make sure that SIS installation updates cenrep keys.
-/////////////////////////////////////////////////////////////////////////////////////
// APPLICATION SETTINGS
/** The base value for application setting keys. */
-const TUint32 KRadioCRApplicationSettingsBase = { 0x00000010 };
-
-/** The key associated with the active focus location setting. */
-const TUint32 KRadioCRActiveFocusLocation = { KRadioCRApplicationSettingsBase + 0x00000000 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved1 = { KRadioCRApplicationSettingsBase + 0x00000001 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved2 = { KRadioCRApplicationSettingsBase + 0x00000002 };
+const TUint32 KRadioCRApplicationSettingsBase = { 0x100 };
/** The key associated with the http cache limit setting. */
-const TUint32 KRadioCRUiFlags = { KRadioCRApplicationSettingsBase + 0x00000003 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved3 = { KRadioCRApplicationSettingsBase + 0x00000004 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved4 = { KRadioCRApplicationSettingsBase + 0x00000005 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved5 = { KRadioCRApplicationSettingsBase + 0x00000006 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved6 = { KRadioCRApplicationSettingsBase + 0x00000007 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved7 = { KRadioCRApplicationSettingsBase + 0x0000000B };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved8 = { KRadioCRApplicationSettingsBase + 0x0000000C };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved9 = { KRadioCRApplicationSettingsBase + 0x0000000D };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved10 = { KRadioCRApplicationSettingsBase + 0x0000000E };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved11 = { KRadioCRApplicationSettingsBase + 0x0000000F };
+const TUint32 KRadioCRUiFlags = { KRadioCRApplicationSettingsBase + 0x0 };
/* The key associated with the application launch count setting */
-const TUint32 KRadioCRLaunchCount = { KRadioCRApplicationSettingsBase + 0x00000010 };
-
-/* The key associated with the application offline mode usability. */
-const TUint32 KRadioCROfflineModeFunctionality = { KRadioCRApplicationSettingsBase + 0x00000011 };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved12 = { KRadioCRApplicationSettingsBase + 0x00000012 };
-
-/* User audio history */
-const TUint32 KRadioCRAudioPlayHistory = { KRadioCRApplicationSettingsBase + 0x00000014 };
-
-
-/**
-* Removed. Do not use.
-*/
-enum TVRCRRemoved
- {
- EVRCRRemoved13,
- EVRCRRemoved14
- };
+const TUint32 KRadioCRLaunchCount = { KRadioCRApplicationSettingsBase + 0x1 };
// RADIO SETTINGS
/** The base value for radio setting keys. */
-const TUint32 KRadioCRRadioSettingsBase = { 0x00000100 };
+const TUint32 KRadioCRRadioSettingsBase = { 0x200 };
/** The key associated with the headset volume setting. */
-const TUint32 KRadioCRHeadsetVolume = { KRadioCRRadioSettingsBase + 0x00000000 };
+const TUint32 KRadioCRHeadsetVolume = { KRadioCRRadioSettingsBase + 0x0 };
/** The key associated with the speaker volume setting. */
-const TUint32 KRadioCRSpeakerVolume = { KRadioCRRadioSettingsBase + 0x00000001 };
+const TUint32 KRadioCRSpeakerVolume = { KRadioCRRadioSettingsBase + 0x1 };
/** The key associated with the output mode setting. */
-const TUint32 KRadioCROutputMode = { KRadioCRRadioSettingsBase + 0x00000002 };
+const TUint32 KRadioCROutputMode = { KRadioCRRadioSettingsBase + 0x2 };
/** The key associated with the audio route setting. */
-const TUint32 KRadioCRAudioRoute = { KRadioCRRadioSettingsBase + 0x00000003 };
+const TUint32 KRadioCRAudioRoute = { KRadioCRRadioSettingsBase + 0x3 };
/** The key associated with the headset volume mute setting. */
-const TUint32 KRadioCRHeadsetMuteState = { KRadioCRRadioSettingsBase + 0x00000004 };
+const TUint32 KRadioCRHeadsetMuteState = { KRadioCRRadioSettingsBase + 0x4 };
/** The key associated with the speaker volume mute setting. */
-const TUint32 KRadioCRSpeakerMuteState = { KRadioCRRadioSettingsBase + 0x00000005 };
+const TUint32 KRadioCRSpeakerMuteState = { KRadioCRRadioSettingsBase + 0x5 };
/** The key associated with the radio power state. */
-const TUint32 KRadioCRVisualRadioPowerState = { KRadioCRRadioSettingsBase + 0x00000006 };
+const TUint32 KRadioCRRadioPowerState = { KRadioCRRadioSettingsBase + 0x6 };
/** The key associated with the tuned frequency setting. */
-const TUint32 KRadioCRTunedFrequency = { KRadioCRRadioSettingsBase + 0x00000007 };
+const TUint32 KRadioCRTunedFrequency = { KRadioCRRadioSettingsBase + 0x7 };
/** The key associated with the default minimum volume level setting. */
-const TUint32 KRadioCRDefaultMinVolumeLevel = { KRadioCRRadioSettingsBase + 0x00000008 };
+const TUint32 KRadioCRDefaultMinVolumeLevel = { KRadioCRRadioSettingsBase + 0x8 };
/** The key associated with the current region setting. */
-const TUint32 KRadioCRCurrentRegion = { KRadioCRRadioSettingsBase + 0x0000000A };
-
-/** Removed. Do not use. */
-const TUint32 KRadioCRRemoved15 = { KRadioCRRadioSettingsBase + 0x0000000B };
-
-/** The key associated with the RDS support setting */
-const TUint32 KRadioCRRdsSupport = { KRadioCRRadioSettingsBase + 0x0000000C };
-
-/** The key associated with the alternate frequency search setting */
-const TUint32 KRadioCRRdsAfSearch = { KRadioCRRadioSettingsBase + 0x0000000D };
+const TUint32 KRadioCRCurrentRegion = { KRadioCRRadioSettingsBase + 0x9 };
/*** Region Japan allowed. */
-const TUint32 KRadioCRRegionAllowedJapan = { KRadioCRRadioSettingsBase + 0x0000000E };
-
-/*** Region America allowed. */
-const TUint32 KRadioCRRegionAllowedAmerica = { KRadioCRRadioSettingsBase + 0x0000000F };
-
-/*** Region Other allowed. */
-const TUint32 KRadioCRRegionAllowedDefault = { KRadioCRRadioSettingsBase + 0x00000010 };
+const TUint32 KRadioCRRegionAllowedJapan = { KRadioCRRadioSettingsBase + 0xA };
/*** Default region. */
-const TUint32 KRadioCRDefaultRegion = { KRadioCRRadioSettingsBase + 0x00000011 };
-
-
-// PRESET SETTINGS
-
-/** The base value for preset setting keys. */
-const TUint32 KRadioCRPresetSettingsBase = { 0x00001000 };
-
-/** The key associated with the maximum preset count setting. */
-const TUint32 KRadioCRPresetCount = { KRadioCRPresetSettingsBase + 0x00000000 };
-
-// CORE SETTINGS
-
-/** The base value for core setting keys. */
-const TUint32 KRadioCRCoreSettingsBase = { 0x00010000 };
-
-/** The key associated with the global name server address setting. */
-const TUint32 KRadioCRGlobalNameServer = { KRadioCRCoreSettingsBase + 0x00000000 };
-
-/** The key associated with the default global name server address setting. */
-const TUint32 KRadioCRDefaultGlobalNameServer = { KRadioCRCoreSettingsBase + 0x00000001 };
-
-/** The key associated with the local name server address setting. */
-const TUint32 KRadioCRLocalNameServer = { KRadioCRCoreSettingsBase + 0x00000002 };
-
-/** The key associated with the default local name server address setting. */
-const TUint32 KRadioCRDefaultLocalNameServer = { KRadioCRCoreSettingsBase + 0x00000003 };
-
-/** The key associated with the directory server url setting. */
-const TUint32 KRadioCRDirectoryServerUrl = { KRadioCRCoreSettingsBase + 0x00000004 };
-
-/** The key associated with the directory server base url setting. */
-const TUint32 KRadioCRDirectoryServerBaseUrl = { KRadioCRCoreSettingsBase + 0x00000005 };
-
-/** The key associated with the directory server country code setting. */
-const TUint32 KRadioCRDirectoryServerCountryCode = { KRadioCRCoreSettingsBase + 0x00000006 };
-
-/** The key associated with the directory server network id setting. */
-const TUint32 KRadioCRDirectoryServerNetworkId = { KRadioCRCoreSettingsBase + 0x00000007 };
-
-/** The key associated with the default directory server url setting. */
-const TUint32 KRadioCRDefaultDirectoryServerUrl = { KRadioCRCoreSettingsBase + 0x00000008 };
-
-/** The key associated with the default directory server base url setting. */
-const TUint32 KRadioCRDefaultDirectoryServerBaseUrl = { KRadioCRCoreSettingsBase + 0x00000009 };
-
-/** The key associated with the internet access point setting. */
-const TUint32 KRadioCRInternetAccessPoint = { KRadioCRCoreSettingsBase + 0x0000000A };
-
-/** The key associated with the default internet access point setting. */
-const TUint32 KRadioCRDefaultInternetAccessPoint = { KRadioCRCoreSettingsBase + 0x0000000B };
-
-/** The key associated with application id setting. */
-const TUint32 KRadioCRApplicationId = { KRadioCRCoreSettingsBase + 0x0000000C };
+const TUint32 KRadioCRDefaultRegion = { KRadioCRRadioSettingsBase + 0xB };
/** The key associated with the network id setting. */
-const TUint32 KRadioCRNetworkId = { KRadioCRCoreSettingsBase + 0x0000000D };
-
-/** The key associated with the subscriber id setting. */
-const TUint32 KRadioCRSubscriberId = { KRadioCRCoreSettingsBase + 0x0000000E };
-
-/** The key associated with the connection destination setting. */
-const TUint32 KRadioCRConnectionDestinationId = { KRadioCRCoreSettingsBase + 0x0000000F };
+const TUint32 KRadioCRNetworkId = { KRadioCRRadioSettingsBase + 0xC };
/** The key associated with the country code setting. */
-const TUint32 KRadioCRCountryCode = { KRadioCRCoreSettingsBase + 0x00000010 };
+const TUint32 KRadioCRCountryCode = { KRadioCRRadioSettingsBase + 0xD };
#endif // RADIOINTERNALCRKEYS_H
--- a/radioengine/utils/api/radiointernalpskeys.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +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 RADIOINTERNALPSKEYS_H
-#define RADIOINTERNALPSKEYS_H
-
-#include <e32cmn.h>
-
-#include "radiouid.hrh"
-
-/**< The UID of the category we use. Must be the same as Visual Radio's UID3 ( SID ). */
-//TODO: Change
-const TUid KRadioPSUid = {0x101FF976};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-/// ///
-/// Data properties. These properties are published by Visual Radio and used by other applications. ///
-/// ///
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
-* Currently active channel's ID.
-* Value <code>KErrNone</code> means that no preset channel is active.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSDataChannel = 0x00000000;
-
-/**
-* Currently active frequency.
-* Frequency unit is in kHz.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSDataFrequency = 0x00000001;
-
-/**
-* Current power state of the radio.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioRadioPowerState.
-*/
-const TUint32 KRadioPSDataRadioPowerState = 0x00000002;
-
-/**
-* Power state of the radio.
-*/
-enum TRadioPSRadioPowerState
- {
- ERadioPSRadioPowerStateUninitialized, /**< The key is not yet initialized. */
- ERadioPSRadioPowerOn, /**< Radio power on. */
- ERadioPSRadioPowerOff /**< Radio power off. */
- };
-
-/**
-* Current volume level.
-* Scale is from 1-10.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSDataVolume = 0x00000003;
-
-/**
-* Changing of this value means that channel
-* data of specified channel ID has changed.
-* The value remains indicating the last changed channel ID.
-* Value <code>KErrNone</code> means that no channel data has been changed yet.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSDataChannelDataChanged = 0x00000004;
-
-/**
- * Removed. Do not use.
- */
-const TUint32 KRadioPSDataRemoved = 0x00000005;
-
-/**
-* The current tuning state.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSTuningState.
-*/
-const TUint32 KRadioPSDataTuningState = 0x00000006;
-
-/**
-* Possible tuning states.
-*/
-enum TRadioPSTuningState
- {
- ERadioPSTuningUninitialized, /**< Currently not tuning. */
- ERadioPSTuningStarted, /**< Tuning has been started an lasted less than one second. */
- ERadioPSTuningContinues /**< Tuning has taken more than one second. */
- };
-
-/**
-* Current mute state of radio.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSRadioMuteState.
-*/
-const TUint32 KRadioPSDataRadioMuteState = 0x00000007;
-
-/**
-* Mute state of radio.
-*/
-enum TRadioPSRadioMuteState
- {
- ERadioPSMuteStateUninitialized, /**< The key has not yet been initialized. */
- ERadioPSMuteStateOn, /**< Radio mute state is on. */
- ERadioPSMuteStateOff /**< Radio mute state is off. */
- };
-
-/**
-* Indicates if Visual Radio is running or closing.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSApplicationRunningState.
-*/
-const TUint32 KRadioPSDataApplicationRunning = 0x00000008;
-
-/**
-* Visual Radio application running states.
-*/
-enum TRadioPSApplicationRunningState
- {
- ERadioPSApplicationUninitialized, /**< Visual Radio application's state is not yet initialized. */
- ERadioPSApplicationRunning, /**< Visual Radio application is running. */
- ERadioPSApplicationClosing /**< Visual Radio application is closing. */
- };
-
-/**
-* Indicates the current headset connectivity status.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioHeadsetStatus
-*/
-const TUint32 KRadioPSDataHeadsetStatus = 0x00000009;
-
-/**
-* Current headset status.
-*/
-enum TRadioPSHeadsetStatus
- {
- ERadioPSHeadsetUninitialized, /**< The headset status is uninitialized. */
- ERadioPSHeadsetDisconnected, /**< The headset is disconnected. */
- ERadioPSHeadsetConnected /**< The headset is connected. */
- };
-
-/**
-* The current frequency decimal count.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioFrequencyDecimalCount.
-*/
-const TUint32 KRadioPSDataFrequencyDecimalCount = 0x00000010;
-
-/**
-* The current frequency decimal count.
-*/
-enum TRadioPSFrequencyDecimalCount
- {
- ERadioPSFrequencyDecimalCountUninitialized, /**< Frequency decimal count has not yet been initialized. */
- ERadioPSFrequencyOneDecimal, /**< Frequency accuracy is one decimal. */
- ERadioPSFrequencyTwoDecimals, /**< Frequency accuracy is two decimals. */
- ERadioPSFrequencyThreeDecimals /**< Frequency accuracy is three decimals. */
- };
-
-/**
-* Removed. Do not use.
-*/
-const TUint32 KRadioPSRemoved1 = 0x00000014;
-
-/**
-* Flag to indicate if loudspeaker is in use
-*/
-const TUint32 KRadioPSDataLoudspeakerStatus = 0x00000015;
-/**
-* Current speaker status.
-*/
-enum TRadioPSLoudspeakerStatus
- {
- ERadioPSLoudspeakerUninitialized, /**< The speaker status is uninitialized. */
- ERadioPSLoudspeakerNotInUse, /**< The speaker is not in use. */
- ERadioPSLoudpeakerInUse /**< The speaker is in use. */
- };
-
-/**
-* Rds Program Service information, property type is text.
-*/
-const TUint32 KRadioPSDataRdsProgramService = 0x00000016;
-
-/**
-* Rds Radio Text information.
-* Type <code>RProperty::EText</code>.
-*/
-const TUint32 KRadioPSDataRdsRadioText = 0x00000017;
-
-/**
- * Name of the current channel.
- * Type <code>RProperty::EText</code>.
- */
-const TUint32 KRadioPSDataChannelName = 0x00000018;
-
-/**
-* The amount of presets in active preset list.
-* In situations where the amount is undefined, value KErrNotFound
-* is used.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSDataActivePresetListCount = 0x00000019;
-
-/**
-* The active focus in active preset list.
-* In situations where the amount is undefined, value KErrNotFound
-* is used.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSDataActivePresetListFocus = 0x00000020;
-
-/**
- * Current antenna state of the radio.
- * Type <code>RProperty::EInt</code>.
- * @see TRadioRadioAntennaState.
- */
-const TUint32 KRadioPSDataRadioAntennaState = 0x00000021;
-
-/**
-* Power state of the radio.
-*/
-enum TRadioPSRadioAntennaState
- {
- ERadioPSRadioAntennaStateUninitialized, /**< The key is not yet initialized. */
- ERadioPSRadioAntennaAttached, /**< Antenna attached. */
- ERadioPSRadioAntennaDetached /**< Antenna detached. */
- };
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-/// ///
-/// Control properties. These properties are published by other applications and used by Visual Radio. ///
-/// ///
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
-* Steps up or down a channel in channel list.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSStepToChannel.
-*/
-const TUint32 KRadioPSControlStepToChannel = 0x00001000;
-
-/**
-* Step direction of channel step.
-*/
-enum TRadioPSStepToChannel
- {
- ERadioPSStepToChannelUninitialized, /**< Value of the key has not yet been initialized. */
- ERadioPSStepToChannelUp, /**< Step to next channel up. */
- ERadioPSStepToChannelDown /**< Step to next channel down. */
- };
-
-/**
-* Switches to the specified channel ID.
-* Visual Radio ignores channel IDs that are out of scope.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSControlSetChannel = 0x00001001;
-
-/**
-* Seeks to next active frequency up or down.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSSeek.
-*/
-const TUint32 KRadioPSControlSeek = 0x00001002;
-
-/**
-* Seek direction.
-*/
-enum TRadioPSSeek
- {
- ERadioPSSeekUninitialized, /**< Value of the key has not yet been initialized. */
- ERadioPSSeekUp, /**< Seek up. */
- ERadioPSSeekDown /**< Seek down. */
- };
-
-/**
-* Steps up or down frequency, using the frequency step that is defined in radio.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSStepToFrequency.
-*/
-const TUint32 KRadioPSControlStepToFrequency = 0x00001003;
-
-/**
-* Frequency step direction.
-*/
-enum TRadioPSStepToFrequency
- {
- ERadioPSStepToFrequencyUninitialized, /**< The key has not yet been initialized. */
- ERadioPSStepToFrequencyUp, /**< Step up a frequency. */
- ERadioPSStepToFrequencyDown /**< Step down a frequency. */
- };
-
-/**
-* Switches to specified frequency.
-* Frequency unit is kHz.
-* Type <code>RProperty::EInt</code>.
-*/
-const TUint32 KRadioPSControlSetFrequency = 0x00001004;
-
-/**
-* Increases or decreases volume level.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSAdjustVolume.
-*/
-const TUint32 KRadioPSControlAdjustVolume = 0x00001005;
-
-/**
-* Volume step direction.
-*/
-enum TRadioPSAdjustVolume
- {
- ERadioPSAdjustVolumeUninitialized = 0, /**< The key has not yet been initialized. */
- ERadioPSIncreaseVolume, /**< Increase volume. */
- ERadioPSDecreaseVolume /**< Decrease volume. */
- };
-
-/**
-* Sets mute state on or off.
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSRadioMuteState.
-*/
-const TUint32 KRadioPSControlSetRadioMuteState = 0x00001006;
-
-/**
-* Sets the output source
-* Type <code>RProperty::EInt</code>.
-* @see TRadioPSAudioOutput
-*/
-const TUint32 KRadioPSControlSetAudioOutput = 0x00001008;
-
-/**
- * Audio output target.
- */
-enum TRadioPSAudioOutput
- {
- ERadioPSAudioOutputUninitialized = 0, /**< The key has not yet been initialized. */
- ERadioPSAudioOutputHeadset, /**< Headset in use. */
- ERadioPSAudioOutputSpeaker /**< Speaker in use. */
- };
-
-#endif // RADIOINTERNALPSKEYS_H
--- a/radioengine/utils/api/radiouid.hrh Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/api/radiouid.hrh Fri Jun 11 13:38:32 2010 +0300
@@ -19,6 +19,6 @@
#define RADIOUID_HRH
//TODO: Get uid. this is from visual radio
-#define KUidRadioApplication 0x101FF976
+#define KUidRadioApplication 0x2002FF4E
#endif // RADIOUID_HRH
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/bwins/fmradioengineutilsu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,32 @@
+EXPORTS
+ ?ValueDes8@CRadioPropertyObserver@@QBEABVTDesC8@@XZ @ 1 NONAME ; class TDesC8 const & CRadioPropertyObserver::ValueDes8(void) const
+ ?SetAudioRouteL@CRadioRoutableAudio@@QAEXW4TRadioAudioRoute@RadioEngine@@@Z @ 2 NONAME ; void CRadioRoutableAudio::SetAudioRouteL(enum RadioEngine::TRadioAudioRoute)
+ ??0CRadioRoutableAudio@@QAE@PAVCRadioAudioRouter@@@Z @ 3 NONAME ; CRadioRoutableAudio::CRadioRoutableAudio(class CRadioAudioRouter *)
+ ?InitializeL@RadioEngineUtils@@SAXXZ @ 4 NONAME ; void RadioEngineUtils::InitializeL(void)
+ ?NewL@CRadioRemConTarget@@SAPAV1@XZ @ 5 NONAME ; class CRadioRemConTarget * CRadioRemConTarget::NewL(void)
+ ??1CRadioRepositoryEntityBase@@UAE@XZ @ 6 NONAME ; CRadioRepositoryEntityBase::~CRadioRepositoryEntityBase(void)
+ ??1TRadioMethodLogger@@QAE@XZ @ 7 NONAME ; TRadioMethodLogger::~TRadioMethodLogger(void)
+ ??1CRadioRoutableAudio@@UAE@XZ @ 8 NONAME ; CRadioRoutableAudio::~CRadioRoutableAudio(void)
+ ?SetAudioOutput@CRadioRoutableAudio@@IAEXPAVCAudioOutput@@@Z @ 9 NONAME ; void CRadioRoutableAudio::SetAudioOutput(class CAudioOutput *)
+ ?RegisterRoutableAudio@CRadioAudioRouter@@QAEXPAVCRadioRoutableAudio@@@Z @ 10 NONAME ; void CRadioAudioRouter::RegisterRoutableAudio(class CRadioRoutableAudio *)
+ ?ReadFrequencyStringLC@RadioEngineUtils@@SAPAVHBufC16@@KHH@Z @ 11 NONAME ; class HBufC16 * RadioEngineUtils::ReadFrequencyStringLC(unsigned long, int, int)
+ ?ValueDes@CRadioPropertyObserver@@QBEABVTDesC16@@XZ @ 12 NONAME ; class TDesC16 const & CRadioPropertyObserver::ValueDes(void) const
+ ??0CRadioRepositoryEntityBase@@IAE@ABVTUid@@KAAVMRadioRepositoryEntityObserver@@W4TPriority@CActive@@@Z @ 13 NONAME ; CRadioRepositoryEntityBase::CRadioRepositoryEntityBase(class TUid const &, unsigned long, class MRadioRepositoryEntityObserver &, enum CActive::TPriority)
+ ??1CRadioSystemEventCollector@@UAE@XZ @ 14 NONAME ; CRadioSystemEventCollector::~CRadioSystemEventCollector(void)
+ ??1CRadioAudioRouter@@UAE@XZ @ 15 NONAME ; CRadioAudioRouter::~CRadioAudioRouter(void)
+ ?ActivateL@CRadioPropertyObserver@@QAEXXZ @ 16 NONAME ; void CRadioPropertyObserver::ActivateL(void)
+ ?Logger@RadioEngineUtils@@SAPAVMRadioEngineLogger@@XZ @ 17 NONAME ; class MRadioEngineLogger * RadioEngineUtils::Logger(void)
+ ?NewL@CRadioSystemEventCollector@@SAPAV1@XZ @ 18 NONAME ; class CRadioSystemEventCollector * CRadioSystemEventCollector::NewL(void)
+ ?Logger@MRadioEngineLogger@@SAPAV1@XZ @ 19 NONAME ; class MRadioEngineLogger * MRadioEngineLogger::Logger(void)
+ ?Release@RadioEngineUtils@@SAXXZ @ 20 NONAME ; void RadioEngineUtils::Release(void)
+ ?DeleteAudioOutput@CRadioRoutableAudio@@IAEXXZ @ 21 NONAME ; void CRadioRoutableAudio::DeleteAudioOutput(void)
+ ?FormatFrequencyString@RadioEngineUtils@@SAXAAVTDes16@@KHAAVTDesC16@@@Z @ 22 NONAME ; void RadioEngineUtils::FormatFrequencyString(class TDes16 &, unsigned long, int, class TDesC16 &)
+ ?ValueInt@CRadioPropertyObserver@@QBEHXZ @ 23 NONAME ; int CRadioPropertyObserver::ValueInt(void) const
+ ?SetAudioRouteL@CRadioAudioRouter@@QAEXW4TRadioAudioRoute@RadioEngine@@@Z @ 24 NONAME ; void CRadioAudioRouter::SetAudioRouteL(enum RadioEngine::TRadioAudioRoute)
+ ?NewL@CRadioAudioRouter@@SAPAV1@AAVMRadioAudioRoutingObserver@@@Z @ 25 NONAME ; class CRadioAudioRouter * CRadioAudioRouter::NewL(class MRadioAudioRoutingObserver &)
+ ?FsSession@RadioEngineUtils@@SAAAVRFs@@XZ @ 26 NONAME ; class RFs & RadioEngineUtils::FsSession(void)
+ ?UnRegisterRoutableAudio@CRadioAudioRouter@@QAEXPAVCRadioRoutableAudio@@@Z @ 27 NONAME ; void CRadioAudioRouter::UnRegisterRoutableAudio(class CRadioRoutableAudio *)
+ ?AudioRoutingSupported@CRadioRoutableAudio@@QBEHXZ @ 28 NONAME ; int CRadioRoutableAudio::AudioRoutingSupported(void) const
+ ?NewL@CRadioPropertyObserver@@SAPAV1@AAVMRadioPropertyChangeObserver@@ABVTUid@@IW4TRadioPropertyType@1@@Z @ 29 NONAME ; class CRadioPropertyObserver * CRadioPropertyObserver::NewL(class MRadioPropertyChangeObserver &, class TUid const &, unsigned int, enum CRadioPropertyObserver::TRadioPropertyType)
+ ??0TRadioMethodLogger@@QAE@PBG0@Z @ 30 NONAME ; TRadioMethodLogger::TRadioMethodLogger(unsigned short const *, unsigned short const *)
+
--- a/radioengine/utils/bwins/radioengineutilsu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-EXPORTS
- ??0CRadioRoutableAudio@@QAE@PAVCRadioAudioRouter@@@Z @ 1 NONAME ; CRadioRoutableAudio::CRadioRoutableAudio(class CRadioAudioRouter *)
- ??0TRadioMethodLogger@@QAE@PBG0@Z @ 2 NONAME ; TRadioMethodLogger::TRadioMethodLogger(unsigned short const *, unsigned short const *)
- ??1CRadioAudioRouter@@UAE@XZ @ 3 NONAME ; CRadioAudioRouter::~CRadioAudioRouter(void)
- ??1CRadioPubSub@@UAE@XZ @ 4 NONAME ; CRadioPubSub::~CRadioPubSub(void)
- ??1CRadioRepositoryManager@@UAE@XZ @ 5 NONAME ; CRadioRepositoryManager::~CRadioRepositoryManager(void)
- ??1CRadioRoutableAudio@@UAE@XZ @ 6 NONAME ; CRadioRoutableAudio::~CRadioRoutableAudio(void)
- ??1CRadioSystemEventCollector@@UAE@XZ @ 7 NONAME ; CRadioSystemEventCollector::~CRadioSystemEventCollector(void)
- ??1TRadioMethodLogger@@QAE@XZ @ 8 NONAME ; TRadioMethodLogger::~TRadioMethodLogger(void)
- ?ActivateL@CRadioPropertyObserver@@QAEXXZ @ 9 NONAME ; void CRadioPropertyObserver::ActivateL(void)
- ?AudioRoutingSupported@CRadioRoutableAudio@@QBEHXZ @ 10 NONAME ; int CRadioRoutableAudio::AudioRoutingSupported(void) const
- ?DeleteAudioOutput@CRadioRoutableAudio@@IAEXXZ @ 11 NONAME ; void CRadioRoutableAudio::DeleteAudioOutput(void)
- ?Env@RadioEngineUtils@@SAPAVCCoeEnv@@XZ @ 12 NONAME ; class CCoeEnv * RadioEngineUtils::Env(void)
- ?FormatFrequencyString@RadioEngineUtils@@SAXAAVTDes16@@KHAAVTDesC16@@@Z @ 13 NONAME ; void RadioEngineUtils::FormatFrequencyString(class TDes16 &, unsigned long, int, class TDesC16 &)
- ?FsSession@RadioEngineUtils@@SAAAVRFs@@XZ @ 14 NONAME ; class RFs & RadioEngineUtils::FsSession(void)
- ?GetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KAAH@Z @ 15 NONAME ; void CRadioRepositoryManager::GetRepositoryValueL(class TUid const &, unsigned long, int &)
- ?GetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KAAN@Z @ 16 NONAME ; void CRadioRepositoryManager::GetRepositoryValueL(class TUid const &, unsigned long, double &)
- ?GetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KAAVTDes16@@@Z @ 17 NONAME ; void CRadioRepositoryManager::GetRepositoryValueL(class TUid const &, unsigned long, class TDes16 &)
- ?GetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KAAVTDes8@@@Z @ 18 NONAME ; void CRadioRepositoryManager::GetRepositoryValueL(class TUid const &, unsigned long, class TDes8 &)
- ?InitializeL@RadioEngineUtils@@SAXPAVCCoeEnv@@@Z @ 19 NONAME ; void RadioEngineUtils::InitializeL(class CCoeEnv *)
- ?Logger@MRadioEngineLogger@@SAPAV1@XZ @ 20 NONAME ; class MRadioEngineLogger * MRadioEngineLogger::Logger(void)
- ?Logger@RadioEngineUtils@@SAPAVMRadioEngineLogger@@XZ @ 21 NONAME ; class MRadioEngineLogger * RadioEngineUtils::Logger(void)
- ?NewL@CRadioAudioRouter@@SAPAV1@AAVMRadioAudioRoutingObserver@@@Z @ 22 NONAME ; class CRadioAudioRouter * CRadioAudioRouter::NewL(class MRadioAudioRoutingObserver &)
- ?NewL@CRadioPropertyObserver@@SAPAV1@AAVMRadioPropertyChangeObserver@@ABVTUid@@IW4TRadioPropertyType@1@@Z @ 23 NONAME ; class CRadioPropertyObserver * CRadioPropertyObserver::NewL(class MRadioPropertyChangeObserver &, class TUid const &, unsigned int, enum CRadioPropertyObserver::TRadioPropertyType)
- ?NewL@CRadioPubSub@@SAPAV1@XZ @ 24 NONAME ; class CRadioPubSub * CRadioPubSub::NewL(void)
- ?NewL@CRadioRemConTarget@@SAPAV1@XZ @ 25 NONAME ; class CRadioRemConTarget * CRadioRemConTarget::NewL(void)
- ?NewL@CRadioRepositoryManager@@SAPAV1@H@Z @ 26 NONAME ; class CRadioRepositoryManager * CRadioRepositoryManager::NewL(int)
- ?NewL@CRadioSystemEventCollector@@SAPAV1@XZ @ 27 NONAME ; class CRadioSystemEventCollector * CRadioSystemEventCollector::NewL(void)
- ?ReadFrequencyStringLC@RadioEngineUtils@@SAPAVHBufC16@@KHH@Z @ 28 NONAME ; class HBufC16 * RadioEngineUtils::ReadFrequencyStringLC(unsigned long, int, int)
- ?RegisterRoutableAudio@CRadioAudioRouter@@QAEXPAVCRadioRoutableAudio@@@Z @ 29 NONAME ; void CRadioAudioRouter::RegisterRoutableAudio(class CRadioRoutableAudio *)
- ?Release@RadioEngineUtils@@SAXXZ @ 30 NONAME ; void RadioEngineUtils::Release(void)
- ?SetAudioOutput@CRadioRoutableAudio@@IAEXPAVCAudioOutput@@@Z @ 31 NONAME ; void CRadioRoutableAudio::SetAudioOutput(class CAudioOutput *)
- ?SetAudioRouteL@CRadioAudioRouter@@QAEXW4TRadioAudioRoute@RadioEngine@@@Z @ 32 NONAME ; void CRadioAudioRouter::SetAudioRouteL(enum RadioEngine::TRadioAudioRoute)
- ?SetAudioRouteL@CRadioRoutableAudio@@QAEXW4TRadioAudioRoute@RadioEngine@@@Z @ 33 NONAME ; void CRadioRoutableAudio::SetAudioRouteL(enum RadioEngine::TRadioAudioRoute)
- ?SetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KABN@Z @ 34 NONAME ; void CRadioRepositoryManager::SetRepositoryValueL(class TUid const &, unsigned long, double const &)
- ?SetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KABVTDesC16@@@Z @ 35 NONAME ; void CRadioRepositoryManager::SetRepositoryValueL(class TUid const &, unsigned long, class TDesC16 const &)
- ?SetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KABVTDesC8@@@Z @ 36 NONAME ; void CRadioRepositoryManager::SetRepositoryValueL(class TUid const &, unsigned long, class TDesC8 const &)
- ?SetRepositoryValueL@CRadioRepositoryManager@@SAXABVTUid@@KH@Z @ 37 NONAME ; void CRadioRepositoryManager::SetRepositoryValueL(class TUid const &, unsigned long, int)
- ?UnRegisterRoutableAudio@CRadioAudioRouter@@QAEXPAVCRadioRoutableAudio@@@Z @ 38 NONAME ; void CRadioAudioRouter::UnRegisterRoutableAudio(class CRadioRoutableAudio *)
- ?ValueDes8@CRadioPropertyObserver@@QBEABVTDesC8@@XZ @ 39 NONAME ; class TDesC8 const & CRadioPropertyObserver::ValueDes8(void) const
- ?ValueDes@CRadioPropertyObserver@@QBEABVTDesC16@@XZ @ 40 NONAME ; class TDesC16 const & CRadioPropertyObserver::ValueDes(void) const
- ?ValueInt@CRadioPropertyObserver@@QBEHXZ @ 41 NONAME ; int CRadioPropertyObserver::ValueInt(void) const
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/eabi/fmradioengineutilsu.def Fri Jun 11 13:38:32 2010 +0300
@@ -0,0 +1,49 @@
+EXPORTS
+ _ZN16RadioEngineUtils11InitializeLEv @ 1 NONAME
+ _ZN16RadioEngineUtils21FormatFrequencyStringER6TDes16miR7TDesC16 @ 2 NONAME
+ _ZN16RadioEngineUtils21ReadFrequencyStringLCEmii @ 3 NONAME
+ _ZN16RadioEngineUtils6LoggerEv @ 4 NONAME
+ _ZN16RadioEngineUtils7ReleaseEv @ 5 NONAME
+ _ZN16RadioEngineUtils9FsSessionEv @ 6 NONAME
+ _ZN17CRadioAudioRouter14SetAudioRouteLEN11RadioEngine16TRadioAudioRouteE @ 7 NONAME
+ _ZN17CRadioAudioRouter21RegisterRoutableAudioEP19CRadioRoutableAudio @ 8 NONAME
+ _ZN17CRadioAudioRouter23UnRegisterRoutableAudioEP19CRadioRoutableAudio @ 9 NONAME
+ _ZN17CRadioAudioRouter4NewLER26MRadioAudioRoutingObserver @ 10 NONAME
+ _ZN17CRadioAudioRouterD0Ev @ 11 NONAME
+ _ZN17CRadioAudioRouterD1Ev @ 12 NONAME
+ _ZN17CRadioAudioRouterD2Ev @ 13 NONAME
+ _ZN18CRadioRemConTarget4NewLEv @ 14 NONAME
+ _ZN18MRadioEngineLogger6LoggerEv @ 15 NONAME
+ _ZN18TRadioMethodLoggerC1EPKtS1_ @ 16 NONAME
+ _ZN18TRadioMethodLoggerC2EPKtS1_ @ 17 NONAME
+ _ZN18TRadioMethodLoggerD1Ev @ 18 NONAME
+ _ZN18TRadioMethodLoggerD2Ev @ 19 NONAME
+ _ZN19CRadioRoutableAudio14SetAudioOutputEP12CAudioOutput @ 20 NONAME
+ _ZN19CRadioRoutableAudio14SetAudioRouteLEN11RadioEngine16TRadioAudioRouteE @ 21 NONAME
+ _ZN19CRadioRoutableAudio17DeleteAudioOutputEv @ 22 NONAME
+ _ZN19CRadioRoutableAudioC1EP17CRadioAudioRouter @ 23 NONAME
+ _ZN19CRadioRoutableAudioC2EP17CRadioAudioRouter @ 24 NONAME
+ _ZN19CRadioRoutableAudioD0Ev @ 25 NONAME
+ _ZN19CRadioRoutableAudioD1Ev @ 26 NONAME
+ _ZN19CRadioRoutableAudioD2Ev @ 27 NONAME
+ _ZN22CRadioPropertyObserver4NewLER28MRadioPropertyChangeObserverRK4TUidjNS_18TRadioPropertyTypeE @ 28 NONAME
+ _ZN22CRadioPropertyObserver9ActivateLEv @ 29 NONAME
+ _ZN26CRadioRepositoryEntityBaseC2ERK4TUidmR30MRadioRepositoryEntityObserverN7CActive9TPriorityE @ 30 NONAME
+ _ZN26CRadioRepositoryEntityBaseD0Ev @ 31 NONAME
+ _ZN26CRadioRepositoryEntityBaseD1Ev @ 32 NONAME
+ _ZN26CRadioRepositoryEntityBaseD2Ev @ 33 NONAME
+ _ZN26CRadioSystemEventCollector4NewLEv @ 34 NONAME
+ _ZN26CRadioSystemEventCollectorD0Ev @ 35 NONAME
+ _ZN26CRadioSystemEventCollectorD1Ev @ 36 NONAME
+ _ZN26CRadioSystemEventCollectorD2Ev @ 37 NONAME
+ _ZNK19CRadioRoutableAudio21AudioRoutingSupportedEv @ 38 NONAME
+ _ZNK22CRadioPropertyObserver8ValueDesEv @ 39 NONAME
+ _ZNK22CRadioPropertyObserver8ValueIntEv @ 40 NONAME
+ _ZNK22CRadioPropertyObserver9ValueDes8Ev @ 41 NONAME
+ _ZTI15CRadioEngineTls @ 42 NONAME
+ _ZTI19CRadioRoutableAudio @ 43 NONAME
+ _ZTI26CRadioRepositoryEntityBase @ 44 NONAME
+ _ZTV15CRadioEngineTls @ 45 NONAME
+ _ZTV19CRadioRoutableAudio @ 46 NONAME
+ _ZTV26CRadioRepositoryEntityBase @ 47 NONAME
+
--- a/radioengine/utils/eabi/radioengineutilsu.def Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-EXPORTS
- _ZN12CRadioPubSub4NewLEv @ 1 NONAME
- _ZN12CRadioPubSubD0Ev @ 2 NONAME
- _ZN12CRadioPubSubD1Ev @ 3 NONAME
- _ZN12CRadioPubSubD2Ev @ 4 NONAME
- _ZN16RadioEngineUtils11InitializeLEP7CCoeEnv @ 5 NONAME
- _ZN16RadioEngineUtils21FormatFrequencyStringER6TDes16miR7TDesC16 @ 6 NONAME
- _ZN16RadioEngineUtils21ReadFrequencyStringLCEmii @ 7 NONAME
- _ZN16RadioEngineUtils3EnvEv @ 8 NONAME
- _ZN16RadioEngineUtils6LoggerEv @ 9 NONAME
- _ZN16RadioEngineUtils7ReleaseEv @ 10 NONAME
- _ZN16RadioEngineUtils9FsSessionEv @ 11 NONAME
- _ZN17CRadioAudioRouter14SetAudioRouteLEN11RadioEngine16TRadioAudioRouteE @ 12 NONAME
- _ZN17CRadioAudioRouter21RegisterRoutableAudioEP19CRadioRoutableAudio @ 13 NONAME
- _ZN17CRadioAudioRouter23UnRegisterRoutableAudioEP19CRadioRoutableAudio @ 14 NONAME
- _ZN17CRadioAudioRouter4NewLER26MRadioAudioRoutingObserver @ 15 NONAME
- _ZN17CRadioAudioRouterD0Ev @ 16 NONAME
- _ZN17CRadioAudioRouterD1Ev @ 17 NONAME
- _ZN17CRadioAudioRouterD2Ev @ 18 NONAME
- _ZN18CRadioRemConTarget4NewLEv @ 19 NONAME
- _ZN18MRadioEngineLogger6LoggerEv @ 20 NONAME
- _ZN18TRadioMethodLoggerC1EPKtS1_ @ 21 NONAME
- _ZN18TRadioMethodLoggerC2EPKtS1_ @ 22 NONAME
- _ZN18TRadioMethodLoggerD1Ev @ 23 NONAME
- _ZN18TRadioMethodLoggerD2Ev @ 24 NONAME
- _ZN19CRadioRoutableAudio14SetAudioOutputEP12CAudioOutput @ 25 NONAME
- _ZN19CRadioRoutableAudio14SetAudioRouteLEN11RadioEngine16TRadioAudioRouteE @ 26 NONAME
- _ZN19CRadioRoutableAudio17DeleteAudioOutputEv @ 27 NONAME
- _ZN19CRadioRoutableAudioC1EP17CRadioAudioRouter @ 28 NONAME
- _ZN19CRadioRoutableAudioC2EP17CRadioAudioRouter @ 29 NONAME
- _ZN19CRadioRoutableAudioD0Ev @ 30 NONAME
- _ZN19CRadioRoutableAudioD1Ev @ 31 NONAME
- _ZN19CRadioRoutableAudioD2Ev @ 32 NONAME
- _ZN22CRadioPropertyObserver4NewLER28MRadioPropertyChangeObserverRK4TUidjNS_18TRadioPropertyTypeE @ 33 NONAME
- _ZN22CRadioPropertyObserver9ActivateLEv @ 34 NONAME
- _ZN23CRadioRepositoryManager19GetRepositoryValueLERK4TUidmR5TDes8 @ 35 NONAME
- _ZN23CRadioRepositoryManager19GetRepositoryValueLERK4TUidmR6TDes16 @ 36 NONAME
- _ZN23CRadioRepositoryManager19GetRepositoryValueLERK4TUidmRd @ 37 NONAME
- _ZN23CRadioRepositoryManager19GetRepositoryValueLERK4TUidmRi @ 38 NONAME
- _ZN23CRadioRepositoryManager19SetRepositoryValueLERK4TUidmRK6TDesC8 @ 39 NONAME
- _ZN23CRadioRepositoryManager19SetRepositoryValueLERK4TUidmRK7TDesC16 @ 40 NONAME
- _ZN23CRadioRepositoryManager19SetRepositoryValueLERK4TUidmRKd @ 41 NONAME
- _ZN23CRadioRepositoryManager19SetRepositoryValueLERK4TUidmi @ 42 NONAME
- _ZN23CRadioRepositoryManager4NewLEi @ 43 NONAME
- _ZN23CRadioRepositoryManagerD0Ev @ 44 NONAME
- _ZN23CRadioRepositoryManagerD1Ev @ 45 NONAME
- _ZN23CRadioRepositoryManagerD2Ev @ 46 NONAME
- _ZN26CRadioSystemEventCollector4NewLEv @ 47 NONAME
- _ZN26CRadioSystemEventCollectorD0Ev @ 48 NONAME
- _ZN26CRadioSystemEventCollectorD1Ev @ 49 NONAME
- _ZN26CRadioSystemEventCollectorD2Ev @ 50 NONAME
- _ZNK19CRadioRoutableAudio21AudioRoutingSupportedEv @ 51 NONAME
- _ZNK22CRadioPropertyObserver8ValueDesEv @ 52 NONAME
- _ZNK22CRadioPropertyObserver8ValueIntEv @ 53 NONAME
- _ZNK22CRadioPropertyObserver9ValueDes8Ev @ 54 NONAME
- _ZTI15CRadioEngineTls @ 55 NONAME ; #<TI>#
- _ZTI19CRadioRoutableAudio @ 56 NONAME ; #<TI>#
- _ZTV15CRadioEngineTls @ 57 NONAME ; #<VT>#
- _ZTV19CRadioRoutableAudio @ 58 NONAME ; #<VT>#
-
--- a/radioengine/utils/group/radioengineutils.mmp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/group/radioengineutils.mmp Fri Jun 11 13:38:32 2010 +0300
@@ -21,9 +21,9 @@
#include <data_caging_paths.hrh>
-TARGET radioengineutils.dll
+TARGET fmradioengineutils.dll
TARGETTYPE DLL
-UID 0x1000008D 0x10281CB8
+UID 0x1000008D 0x2002FF51
VERSION 10.0
CAPABILITY CAP_GENERAL_DLL
@@ -46,13 +46,9 @@
SOURCE cradioaudiorouter.cpp
SOURCE cradioaccessoryobserver.cpp
SOURCE cradiopropertyobserver.cpp
-SOURCE cradiopubsub.cpp
-SOURCE cradiopubsubimp.cpp
SOURCE cradioremcontarget.cpp
SOURCE cradioremcontargetimp.cpp
SOURCE cradiorepositoryentitybase.cpp
-SOURCE cradiorepositorymanager.cpp
-SOURCE cradiorepositorymanagerimp.cpp
SOURCE cradiosystemeventdetector.cpp
SOURCE cradiosystemeventcollector.cpp
SOURCE cradiosystemeventcollectorimp.cpp
--- a/radioengine/utils/inc/cradioenginetls.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/inc/cradioenginetls.h Fri Jun 11 13:38:32 2010 +0300
@@ -51,14 +51,6 @@
static MRadioEngineLogger* Logger();
/**
- * Return the eikon environment
- *
- * @since Live TV UI v1.0
- * @return Pointer to CEikonEnv
- */
- static CCoeEnv* Env();
-
- /**
* Returns the file server session
*
* @since Live TV UI v1.0
@@ -79,9 +71,9 @@
private:
- static void InitializeL( CCoeEnv* aEnv = NULL, RFs* aFs = NULL );
+ static void InitializeL( RFs* aFs = NULL );
- CRadioEngineTls( CCoeEnv* aEnv, RFs* aFs );
+ CRadioEngineTls( RFs* aFs );
~CRadioEngineTls();
@@ -96,12 +88,6 @@
#endif
/**
- * Pointer to the eikon environment
- * Not own.
- */
- CCoeEnv* iEnv;
-
- /**
* Flag to indicate whether or not the file server session is owned
*/
TBool iFsOwned;
--- a/radioengine/utils/inc/cradiopubsubimp.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +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 CRADIOPUBSUBIMP_H
-#define CRADIOPUBSUBIMP_H
-
-// User includes
-#include "cradiopubsub.h"
-#include "cradiopropertyobserver.h"
-
-/**
- * Publish & Subscribe interface of Radio Application.
- */
-NONSHARABLE_CLASS( CRadioPubSubImp ) : public CRadioPubSub
- , public MRadioPropertyChangeObserver
- {
-public:
-
- static CRadioPubSubImp* NewL();
-
- ~CRadioPubSubImp();
-
-private:
-
- CRadioPubSubImp();
-
- void ConstructL();
-
-// from base class CRadioPubSub
-
- TBool PublishChannel( TInt aChannelId ) const;
- TBool PublishFrequency( TUint32 aFreq ) const;
- TBool PublishPowerState( TBool aPowerOn ) const;
- TBool PublishVolume( TInt aVol ) const;
- TBool PublishChannelDataChanged( TInt aChannelId ) const;
- TBool PublishTuningState( TRadioPSTuningState aTuningState ) const;
- TBool PublishRadioMuteState( TBool aMuted ) const;
- TBool PublishApplicationRunningState( TRadioPSApplicationRunningState aRunningState ) const;
- TBool PublishHeadsetStatus( TRadioPSHeadsetStatus aHeadsetStatus ) const;
- TBool PublishFrequencyDecimalCount( TRadioPSFrequencyDecimalCount aDecimalCount ) const;
- TBool PublishLoudspeakerStatus( TRadioPSLoudspeakerStatus aLoudspeakerStatus ) const;
- TBool PublishRdsProgramService( const TDesC& aProgramService ) const;
- TBool PublishRdsRadioText( const TDesC& aRadioText ) const;
- TBool PublishChannelName( const TDesC& aName ) const;
- TBool PublishActivePreseListCount( TInt aCount ) const;
- TBool PublishActivePreseListFocus( TInt aIndex ) const;
- TBool PublishAntennaState( TRadioPSRadioAntennaState aState ) const;
- void SetControlEventObserver( MRadioControlEventObserver* aControlEventObserver );
-
-// from base class MVRPropertyChangeObserver
-
- void HandlePropertyChangeL( const TUid& aCategory, const TUint aKey, const TInt aValue );
- void HandlePropertyChangeL( const TUid& /*aCategory*/, const TUint /*aKey*/, const TDesC8& /*aValue*/ ) {}
- void HandlePropertyChangeL( const TUid& /*aCategory*/, const TUint /*aKey*/, const TDesC& /*aValue*/ ) {}
- void HandlePropertyChangeErrorL( const TUid& /*aCategory*/, const TUint /*aKey*/, TInt /*aError*/ ) {}
-
-// New functions
-
- /**
- * Defines a property.
- *
- * @param aKey The key of the property.
- * @param aAttr Attributes of the property.
- * @param aDataProperty ETrue if the property is a data property, EFalse
- * if it is a control property
- */
- void DefinePropertyL( TUint aKey, TInt aAttr, TBool aDataProperty ) const;
-
- /**
- * Deletes a property.
- *
- * @param aKey The key of the property.
- */
- void DeleteProperty( TUint aKey ) const;
-
- /**
- * Creates a property observer
- *
- * @param aKey Property key
- * @param aPropertyType Property type
- */
- void CreatePropertyObserverL( const TUint aKey, const TInt aPropertyType );
-
- /**
- * Gets the integer value stored in a property.
- *
- * @param aKey The key of the property.
- * @return The value contained in the property.
- */
- TBool Get( TUint aKey, TInt& aValue ) const;
-
- /**
- * Sets the value in an integer property.
- *
- * @param aKey The key of the property.
- * @param aValue The value to set.
- */
- TBool Set( TUint aKey, TInt aValue ) const;
-
- /**
- * Sets the value in a text property.
- *
- * @param aKey The key of the property.
- * @param aValue The value to set.
- */
- TBool Set( TUint aKey, const TDesC& aValue ) const;
-
-private: // data
-
- /**
- * Pointer to observer in UI side, can be NULL. Not owned.
- */
- MRadioControlEventObserver* iObserver;
-
- /**
- * An array of handlers to P&S interface.
- */
- RPointerArray<CRadioPropertyObserver> iPropertyArray;
-
- };
-
-#endif // CRADIOPUBSUBIMP_H
--- a/radioengine/utils/inc/cradiorepositoryentity.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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 C_RADIOREPOSITORYENTITY_H
-#define C_RADIOREPOSITORYENTITY_H
-
-#include <centralrepository.h>
-#include "cradiorepositoryentitybase.h"
-#include "mradiorepositoryentityobserver.h"
-
-/**
- * Templated class to listen to a single key within the central repository.
- *
- * Notifies the observer of changes in the key, and provides caching for the key's value.
- */
-template <typename T>
-NONSHARABLE_CLASS( CRadioRepositoryEntity ) : public CRadioRepositoryEntityBase
- {
-
-public:
-
- static CRadioRepositoryEntity<T>* NewL( const TUid& aUid,
- TUint32 aKey,
- MRadioRepositoryEntityObserver& aObserver,
- CActive::TPriority aPriority = CActive::EPriorityStandard );
-
- ~CRadioRepositoryEntity();
-
- /**
- * Sets the value of the entity.
- * The value is written into the central repository immediately.
- *
- * @param aValue The value to set.
- * @param aSavingEnabled If ETrue, saving to central repository file is enabled
- */
- TInt SetValue( const T& aValue, TBool aSavingEnabled );
-
- /**
- * Returns a cached reference to the value of the entity.
- *
- * @return The cached value of the entity.
- */
- const T& Value() const;
-
- /**
- * Forcibly updates the key's value from the central repository and caches it.
- */
- void UpdateL();
-
-// from base class CActive
-
- void RunL();
- void DoCancel();
-
-private:
-
- CRadioRepositoryEntity( const TUid& aUid,
- TUint32 aKey,
- MRadioRepositoryEntityObserver& aObserver,
- CActive::TPriority aPriority );
-
- void ConstructL();
-
-protected:
-
- /** The central repository client. */
- CRepository* iRepository;
-
- /** The cached value of the key. */
- T iValue;
-
- };
-
-#include "cradiorepositoryentity.inl"
-
-#endif // C_RADIOREPOSITORYENTITY_H
--- a/radioengine/utils/inc/cradiorepositoryentity.inl Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +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:
-*
-*/
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-CRadioRepositoryEntity<T>* CRadioRepositoryEntity<T>::NewL( const TUid& aUid,
- TUint32 aKey,
- MRadioRepositoryEntityObserver& aObserver,
- CActive::TPriority aPriority )
- {
- CRadioRepositoryEntity<T>* self = new ( ELeave ) CRadioRepositoryEntity<T>( aUid, aKey, aObserver, aPriority );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-CRadioRepositoryEntity<T>::CRadioRepositoryEntity( const TUid& aUid,
- TUint32 aKey,
- MRadioRepositoryEntityObserver& aObserver,
- CActive::TPriority aPriority )
- : CRadioRepositoryEntityBase( aUid, aKey, aObserver, aPriority )
- {
- }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-void CRadioRepositoryEntity<T>::ConstructL()
- {
- iRepository = CRepository::NewL( iUid );
-
- CActiveScheduler::Add( this );
- RunL();
- }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-CRadioRepositoryEntity<T>::~CRadioRepositoryEntity()
- {
- Cancel();
- delete iRepository;
- }
-
-// -----------------------------------------------------------------------------
-// Sets the value of the key.
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-TInt CRadioRepositoryEntity<T>::SetValue( const T& aValue, TBool aSavingEnabled )
- {
- iValue = aValue;
- if ( aSavingEnabled )
- {
- return iRepository->Set( iKey, aValue );
- }
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// Returns the cached copy of the key's value.
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-const T& CRadioRepositoryEntity<T>::Value() const
- {
- return iValue;
- }
-
-// -----------------------------------------------------------------------------
-// Forcibly updates the cached value from the repository.
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-void CRadioRepositoryEntity<T>::UpdateL()
- {
- User::LeaveIfError( iRepository->Get( iKey, iValue ) );
- }
-
-// -----------------------------------------------------------------------------
-// Executed when the key's value is changed.
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-void CRadioRepositoryEntity<T>::RunL()
- {
- User::LeaveIfError( iRepository->NotifyRequest( iKey, iStatus ) );
- SetActive();
-
- TInt err = iRepository->Get( iKey, iValue );
- iObserver.HandleRepositoryValueChangeL( iUid, iKey, iValue, err );
- }
-
-// -----------------------------------------------------------------------------
-// Cancels all pending notifications.
-// -----------------------------------------------------------------------------
-//
-template <typename T>
-void CRadioRepositoryEntity<T>::DoCancel()
- {
- iRepository->NotifyCancel( iKey );
- }
--- a/radioengine/utils/inc/cradiorepositoryentitybase.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +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 C_RADIOREPOSITORYENTITYBASE_H
-#define C_RADIOREPOSITORYENTITYBASE_H
-
-#include <e32base.h>
-
-class MRadioRepositoryEntityObserver;
-
-/**
- * Base class for a central repository entity.
- *
- * All instantiable central repository entities must be derived from this class.
- * The class is provided so that a heterogenous array of templated objects can be created, and to
- * provide common data fields for the said purpose.
- */
-NONSHARABLE_CLASS( CRadioRepositoryEntityBase ) : public CActive
- {
-
-public:
-
- ~CRadioRepositoryEntityBase();
-
- /**
- * Returns the UID of the repository the entity is bound to.
- *
- * @return The UID of the repository the entity is bound to.
- */
- const TUid& Uid() const;
-
- /**
- * Returns the key the entity is bound to.
- *
- * @return The key the entity is bound to.
- */
- TUint32 Key() const;
-
-protected:
-
- /**
- * Constructor.
- *
- * @param aUid The UID of the repository that this entity will be bound to.
- * @param aKey The key within the repository that this entity will be bound to.
- * @param aObserver The observer that is notified whenever the value of the key within the repository changes.
- * @param aPriority The priority of the active object.
- */
- CRadioRepositoryEntityBase( const TUid& aUid, TUint32 aKey, MRadioRepositoryEntityObserver& aObserver, CActive::TPriority aPriority );
-
-protected:
-
- /** The observer that is notified of changes in the key. */
- MRadioRepositoryEntityObserver& iObserver;
-
- /** The UID of the repository the entity is bound to. */
- TUid iUid;
-
- /** The key the entity is bound to.. */
- TUint32 iKey;
-
- };
-
-#endif // C_RADIOREPOSITORYENTITYBASE_H
--- a/radioengine/utils/inc/cradiorepositorymanagerimp.h Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +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 C_RADIOREPOSITORYMANAGERIMP_H
-#define C_RADIOREPOSITORYMANAGERIMP_H
-
-// System includes
-#include <centralrepository.h>
-
-// User includes
-#include "mradiorepositoryentityobserver.h"
-
-// Forward declarations
-class CRadioRepositoryEntityBase;
-
-/**
- * Central repository entity manager.
- *
- * Manages central repository entities that listen to specific repository and a key within it, notifying the observer
- * whenever the key's value changes.
- *
- * Also a set of static methods are provided that wrap the common use case of central repository where the user
- * is only interested to read or write the value of a key and then discard the repository object.
- */
-NONSHARABLE_CLASS( CRadioRepositoryManagerImp ) : public CRadioRepositoryManager
- , public MRadioRepositoryEntityObserver
- {
-
-public:
-
- static CRadioRepositoryManagerImp* NewL( TInt aGranularity );
-
- ~CRadioRepositoryManagerImp();
-
- /**
- * Sets the value of an integer key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue The value to set.
- */
- static void SetRepositoryValueL( const TUid& aUid, TUint32 aKey, TInt aValue );
-
- /**
- * Sets the value of a floating point key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue The value to set.
- */
- static void SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TReal& aValue );
-
- /**
- * Sets the value of a binary key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue The value to set.
- */
- static void SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TDesC8& aValue );
-
- /**
- * Sets the value of a string key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue The value to set.
- */
- static void SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TDesC16& aValue );
-
- /**
- * Gets the value of an integer key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue On return, the value of the key within the repository.
- */
- static void GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TInt& aValue );
-
- /**
- * Gets the value of a floating point key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue On return, the value of the key within the repository.
- */
- static void GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TReal& aValue );
-
- /**
- * Gets the value of a binary key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue On return, the value of the key within the repository.
- */
- static void GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TDes8& aValue );
-
- /**
- * Gets the value of a string key in the repository.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue On return, the value of the key within the repository.
- */
- static void GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TDes16& aValue );
-
-private:
-
- CRadioRepositoryManagerImp( TInt aGranularity );
-
- void ConstructL();
-
-// from base class CRadioRepositoryManager
-
- void AddObserverL( MRadioRepositoryEntityObserver* aObserver );
- void RemoveObserver( MRadioRepositoryEntityObserver* aObserver );
- void EnableSave( TBool aEnable );
- void AddEntityL( const TUid& aUid, TUint32 aKey, TRadioEntityType aType );
- void RemoveEntity( const TUid& aUid, TUint32 aKey );
- TInt SetEntityValue( const TUid& aUid, TUint32 aKey, TInt aValue );
- TInt SetEntityValue( const TUid& aUid, TUint32 aKey, const TReal& aValue );
- TInt SetEntityValue( const TUid& aUid, TUint32 aKey, const TDesC8& aValue );
- TInt SetEntityValue( const TUid& aUid, TUint32 aKey, const TDesC16& aValue );
- TInt EntityValueInt( const TUid& aUid, TUint32 aKey ) const;
- const TReal& EntityValueReal( const TUid& aUid, TUint32 aKey ) const;
- const TDesC8& EntityValueDes8( const TUid& aUid, TUint32 aKey ) const;
- const TDesC16& EntityValueDes16( const TUid& aUid, TUint32 aKey ) const;
-
- /**
- * Sets the value of an entity.
- *
- * @param aUid The UID of the entity.
- * @param aKey The key of the entity.
- * @param aValue The value to set.
- */
- template <typename T>
- TInt DoSetEntityValue( const TUid& aUid, TUint32 aKey, const T& aValue );
-
- /**
- * Returns an entity's cached value.
- *
- * @param aUid The UID of the entity.
- * @param aKey The key of the entity.
- * @return The cached value of the entity.
- */
- template <typename T>
- const T& DoEntityValue( const TUid& aUid, TUint32 aKey ) const;
-
- /**
- * Sets the value of a key.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @param aValue The value to set.
- */
- template <typename T>
- static void DoSetRepositoryValueL( const TUid& aUid, TUint32 aKey, const T& aValue );
-
- /**
- * Returns a key's value.
- *
- * @param aUid The UID of the repository.
- * @param aKey The key within the repository.
- * @return The key's value.
- */
- template <typename T>
- static void DoGetRepositoryValueL( const TUid& aUid, TUint32 aKey, T& aValue );
-
- /**
- * Returns the entity's index by its UID and key.
- *
- * @param aUid The UID of the entity.
- * @param aKey The key of the entity.
- * @param The entity's index or <code>KErrNotFound</code> if no such entity could be found.
- */
- TInt EntityIndex( const TUid& aUid, TUint32 aKey ) const;
-
- /**
- * SIS installation does not update central repository, this checks that the new keys are in the repository.
- */
- void CheckRepositoryKeysL();
-
-// from base class MRadioRepositoryEntityObserver
-
- void HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, TInt aValue, TInt aError );
- void HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, const TReal& aValue, TInt aError );
- void HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, const TDesC8& aValue, TInt aError );
- void HandleRepositoryValueChangeL( const TUid& aUid, TUint32 aKey, const TDesC16& aValue, TInt aError );
-
-private: // data
-
- /** The observers that are notified of changes in the entities' values. */
- RPointerArray<MRadioRepositoryEntityObserver> iObservers;
-
- /** The entities registered. */
- RPointerArray<CRadioRepositoryEntityBase> iEntities;
-
- /** Indicates whether or not the entities are allowed to write to the repository. */
- TBool iEnableSave;
-
- };
-
-#endif // C_RADIOREPOSITORYMANAGERIMP_H
--- a/radioengine/utils/inc/cradiosystemeventcollectorimp.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/inc/cradiosystemeventcollectorimp.h Fri Jun 11 13:38:32 2010 +0300
@@ -57,7 +57,6 @@
TBool IsCallActive() const;
TBool IsAudioResourcesAvailable() const;
TBool IsHeadsetConnectedL() const;
- TBool IsVoiceUiActive() const;
void NotifyObserversL( TRadioSystemEventType aEvent );
--- a/radioengine/utils/inc/cradiosystemeventdetector.h Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/inc/cradiosystemeventdetector.h Fri Jun 11 13:38:32 2010 +0300
@@ -80,11 +80,6 @@
void ConstructL();
- /**
- * Used internally to change network coverage status and report it to observer.
- */
- void SetNetworkCoverageL( const TBool aIsMobileNetworkCoverage, const TBool aIsWlanCoverage );
-
CRadioSystemEventDetector( MRadioSystemEventDetectorObserver& aObserver );
private: // data
@@ -93,31 +88,23 @@
MRadioSystemEventDetectorObserver& iObserver;
/** handler to Publish & Subscribe interface*/
- CRadioPropertyObserver* iCallStatusObserver;
- /** handler to Publish & Subscribe interface*/
- CRadioPropertyObserver* iNetworkStatusObserver;
+ CRadioPropertyObserver* iCallStatusObserver;
/** handler to Publish & Subscribe interface*/
- CRadioPropertyObserver* iVoiceUiObserver;
+ CRadioPropertyObserver* iNetworkStatusObserver;
/** handler to Publish & Subscribe interface*/
- CRadioPropertyObserver* iAudioPolicyObserver;
+ CRadioPropertyObserver* iAudioPolicyObserver;
/**Indicator for the mobile network status*/
- TBool iIsMobileNetworkCoverage;
-
- /**Indicator for the wlan network status*/
- TBool iIsWlanCoverage;
+ TBool iIsMobileNetworkCoverage;
/**Indicator for the call status*/
- TBool iIsCallActive;
+ TBool iIsCallActive;
/** Array of audio policy categories that VR must not resume after. */
- RArray<TInt> iNoAutoResumeAudioCategories;
+ RArray<TInt> iNoAutoResumeAudioCategories;
/** Indicator for audio resource status. */
- TBool iIsAudioResourcesAvailable;
-
- /** Indicator for Voice UI status. */
- TBool iIsVoiceUiActive;
+ TBool iIsAudioResourcesAvailable;
};
--- a/radioengine/utils/src/cradioaccessoryobserver.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradioaccessoryobserver.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -15,11 +15,21 @@
*
*/
+// System includes
+#include <ncp_feature_settings.hrh>
+
// User includes
#include "cradioaccessoryobserver.h"
#include "mradioheadseteventobserver.h"
#include "cradioenginelogger.h"
+#ifdef ASW_CORE_AUDIO_PLATFORM_VERSION // Nokia specific adaptation
+#include <internal/accpolpropgenericid.h>
+const TUint KPhysicalConnectionBitmask = KPCNokiaAV | KPCWired;
+#else
+const TUint KPhysicalConnectionBitmask = KPCWired;
+#endif // ASW_CORE_AUDIO_PLATFORM_VERSION
+
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
@@ -27,6 +37,7 @@
CRadioAccessoryObserver::CRadioAccessoryObserver()
: CActive( CActive::EPriorityStandard )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
@@ -36,7 +47,7 @@
//
void CRadioAccessoryObserver::ConstructL()
{
- LOG_METHOD_AUTO;
+ LEVEL2( LOG_METHOD_AUTO );
User::LeaveIfError( iAccessoryServer.Connect() );
// Creates a new sub-session within an existing session.
@@ -45,7 +56,7 @@
TInt nroChangedAccessories( 0 );
UpdateCurrentAccessoriesL( nroChangedAccessories );
- LOG_FORMAT( "CRadioAccessoryObserver::ConstructL() -- Found %d wired/BT accessories ( %d accessories in total ).",
+ LOG_FORMAT( "Found %d wired/BT accessories ( %d accessories in total ).",
nroChangedAccessories, iAccPolGenIdArr.Count() );
CActiveScheduler::Add( this );
// Accessory is always listened
@@ -59,6 +70,7 @@
//
CRadioAccessoryObserver* CRadioAccessoryObserver::NewL()
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioAccessoryObserver* self = new( ELeave ) CRadioAccessoryObserver;
CleanupStack::PushL( self );
self->ConstructL();
@@ -72,6 +84,7 @@
//
CRadioAccessoryObserver::~CRadioAccessoryObserver()
{
+ LEVEL3( LOG_METHOD_AUTO );
Cancel();
iAccessoryConn.CloseSubSession();
iAccessoryServer.Close();
@@ -84,6 +97,7 @@
//
TBool CRadioAccessoryObserver::FindAccessoryL( TBool aAcceptOnlyHeadset, TAccAudioOutPutType& aOutputType ) const
{
+ LEVEL2( LOG_METHOD_AUTO );
#ifdef __WINS__
TBool accessoryFound = ETrue;
aAcceptOnlyHeadset = ETrue;
@@ -91,16 +105,16 @@
#else
TBool accessoryFound = EFalse;
- LOG_FORMAT( "CRadioAccessoryObserver::FindAccessoryL - Connected accessories count = %d", iAccPolGenIdArr.Count());
+ LOG_FORMAT( "Connected accessories count = %d", iAccPolGenIdArr.Count());
for ( TInt i = 0; i < iAccPolGenIdArr.Count() && !accessoryFound; i++ )
{
TAccPolGenericID accPolGenId = iAccPolGenIdArr.GetGenericIDL( i );
//Check if physical connection is of acceptable type
TUint32 physicalConnectionCaps = accPolGenId.PhysicalConnectionCaps();
- if ( physicalConnectionCaps & KPCWired || physicalConnectionCaps & KPCBluetooth )
+ if ( physicalConnectionCaps & KPhysicalConnectionBitmask || physicalConnectionCaps & KPCBluetooth )
{
- LOG_FORMAT( "CRadioAccessoryObserver::FindAccessoryL - is wired or BT ( physicalConnectionCaps = %d )", physicalConnectionCaps );
+ LOG_FORMAT( "is wired or BT ( physicalConnectionCaps = %d )", physicalConnectionCaps );
if ( !aAcceptOnlyHeadset )
{
@@ -110,21 +124,21 @@
TUint32 deviceType = accPolGenId.DeviceTypeCaps();
if ( deviceType & KDTHeadset )
{
- LOG_FORMAT( "CRadioAccessoryObserver::FindAccessoryL - is HeadSet( deviceType = %d )", deviceType );
+ LOG_FORMAT( "is HeadSet( deviceType = %d )", deviceType );
if ( !IsLineoutConnectedL( accPolGenId ) )
{
- LOG( "CRadioAccessoryObserver::FindAccessoryL - Is a normal headSet" );
+ LOG( "Is a normal headSet" );
accessoryFound = ETrue;
}
}
else if ( deviceType & KDTLoopset )
{
- LOG_FORMAT( "CRadioAccessoryObserver::FindAccessoryL - is Loopset( deviceType = %d )", deviceType );
+ LOG_FORMAT( "is Loopset( deviceType = %d )", deviceType );
accessoryFound = ETrue;
}
else
{
- LOG_FORMAT( "CRadioAccessoryObserver::FindWiredAccessoryL - is NOT HeadSet or Loopset( deviceType = %d )", deviceType );
+ LOG_FORMAT( "is NOT HeadSet or Loopset( deviceType = %d )", deviceType );
}
if ( accessoryFound )
@@ -137,12 +151,12 @@
iAccessoryConn.GetValueL( accPolGenId, nameRecord, audioOutputTypeValue );
aOutputType = static_cast<TAccAudioOutPutType>( audioOutputTypeValue.iValue );
- LOG_FORMAT( "CRadioAccessoryObserver::FindAccessoryL - AudioOutputType = %d", aOutputType );
+ LOG_FORMAT( "AudioOutputType = %d", aOutputType );
}
}
else
{
- LOG_FORMAT( "CRadioAccessoryObserver::FindAccessoryL - is NOT wired or BT ( physicalConnectionCaps = %d )", physicalConnectionCaps );
+ LOG_FORMAT( "is NOT wired or BT ( physicalConnectionCaps = %d )", physicalConnectionCaps );
}
}
#endif
@@ -165,6 +179,7 @@
//
TBool CRadioAccessoryObserver::IsLineoutConnectedL( TAccPolGenericID& aAccPolGenId ) const
{
+ LEVEL2( LOG_METHOD_AUTO );
TBool isLineOut( EFalse );
CAccPolSubblockNameArray* nameArray = CAccPolSubblockNameArray::NewL();
@@ -175,7 +190,7 @@
CleanupStack::PopAndDestroy( nameArray );
if ( isAudioOutValue )
{
- LOG_FORMAT( "CRadioAccessoryObserver::IsLineoutConnectedL - isAudioOutValue = ( %d )", isAudioOutValue );
+ LOG_FORMAT( "isAudioOutValue = ( %d )", isAudioOutValue );
TAccPolNameRecord nameRecord;
nameRecord.SetNameL( KAccAudioOut );
@@ -188,7 +203,7 @@
if ( TAccAudioOutLineout == audioOutValue.iValue )
{
//is lineout
- LOG_FORMAT( "CRadioAccessoryObserver::IsLineoutConnectedL - Accessory is LineOut( audioOutValue = %d )", audioOutValue.iValue );
+ LOG_FORMAT( "Accessory is LineOut( audioOutValue = %d )", audioOutValue.iValue );
isLineOut = ETrue;
}
}
@@ -201,12 +216,13 @@
//
void CRadioAccessoryObserver::UpdateCurrentAccessoriesL( TInt& aNroChangedAccessories )
{
+ LEVEL2( LOG_METHOD_AUTO );
// first check, the removed accessories.
TInt removedAccessories = CountRemovedAccessoriesL();
- LOG_FORMAT( "CRadioAccessoryObserver::UpdateCurrentAccessoriesL() -- %d accessories removed.", removedAccessories );
+ LOG_FORMAT( "- %d accessories removed.", removedAccessories );
aNroChangedAccessories += removedAccessories;
TInt addedAccessories = CountAddedAccessoriesL();
- LOG_FORMAT( "CRadioAccessoryObserver::UpdateCurrentAccessoriesL() -- %d accessories added.", addedAccessories );
+ LOG_FORMAT( "- %d accessories added.", addedAccessories );
aNroChangedAccessories += addedAccessories;
iSavedAccessories.Reset();
@@ -214,10 +230,10 @@
for ( TInt i = 0; i < iAccPolGenIdArr.Count(); i++ )
{
iSavedAccessories.AppendL( iAccPolGenIdArr.GetGenericIDL( i ) );
- LOG_FORMAT( "CRadioAccessoryObserver::UpdateCurrentAccessoriesL() -- accessory in slot %d: %d",
+ LOG_FORMAT( "- accessory in slot %d: %d",
i, iAccPolGenIdArr.GetGenericIDL( i ).UniqueID() );
}
- LOG_FORMAT( "CRadioAccessoryObserver::UpdateCurrentAccessoriesL() -- %d accessories in total.", iSavedAccessories.Count() );
+ LOG_FORMAT( "- %d accessories in total.", iSavedAccessories.Count() );
}
// ---------------------------------------------------------------------------
@@ -226,6 +242,7 @@
//
TInt CRadioAccessoryObserver::CountRemovedAccessoriesL() const
{
+ LEVEL2( LOG_METHOD_AUTO );
TInt removedAccessories( 0 );
for ( TInt i = 0; i < iSavedAccessories.Count(); i++ )
@@ -234,7 +251,7 @@
TUint32 physicalConnectionCaps = savedAcc.PhysicalConnectionCaps();
- if ( physicalConnectionCaps & KPCWired || physicalConnectionCaps & KPCBluetooth )
+ if ( physicalConnectionCaps & KPhysicalConnectionBitmask || physicalConnectionCaps & KPCBluetooth )
{
TBool found( EFalse );
@@ -243,13 +260,13 @@
TAccPolGenericID freshAcc = iAccPolGenIdArr.GetGenericIDL( j );
if ( freshAcc.UniqueID() == savedAcc.UniqueID() )
{
- LOG_FORMAT( "CRadioAccessoryObserver::CountRemovedAccessoriesL() -- Accessory with id = %d found.", savedAcc.UniqueID() );
+ LOG_FORMAT( "- Accessory with id = %d found.", savedAcc.UniqueID() );
found = ETrue;
}
}
if ( !found )
{
- LOG_FORMAT( "CRadioAccessoryObserver::CountRemovedAccessoriesL() -- Accessory with id = %d removed.", savedAcc.UniqueID() );
+ LOG_FORMAT( "- Accessory with id = %d removed.", savedAcc.UniqueID() );
removedAccessories++;
}
}
@@ -263,6 +280,7 @@
//
TInt CRadioAccessoryObserver::CountAddedAccessoriesL() const
{
+ LEVEL2( LOG_METHOD_AUTO );
TInt addedAccessories( 0 );
for ( TInt i = 0; i < iAccPolGenIdArr.Count(); i++ )
@@ -271,7 +289,7 @@
TUint32 physicalConnectionCaps = freshAcc.PhysicalConnectionCaps();
- if ( physicalConnectionCaps & KPCWired || physicalConnectionCaps & KPCBluetooth )
+ if ( physicalConnectionCaps & KPhysicalConnectionBitmask || physicalConnectionCaps & KPCBluetooth )
{
TBool found( EFalse );
@@ -280,13 +298,13 @@
TAccPolGenericID savedAcc = iSavedAccessories[j];
if ( savedAcc.UniqueID() == freshAcc.UniqueID() )
{
- LOG_FORMAT( "CRadioAccessoryObserver::CountAddedAccessoriesL() -- Accessory with id = %d found.", freshAcc.UniqueID() );
+ LOG_FORMAT( "- Accessory with id = %d found.", freshAcc.UniqueID() );
found = ETrue;
}
}
if ( !found )
{
- LOG_FORMAT( "CRadioAccessoryObserver::CountAddedAccessoriesL() -- Accessory with id = %d added.", freshAcc.UniqueID() );
+ LOG_FORMAT( "- Accessory with id = %d added.", freshAcc.UniqueID() );
addedAccessories++;
}
}
@@ -310,6 +328,7 @@
//
void CRadioAccessoryObserver::RunL()
{
+ LEVEL2( LOG_METHOD_AUTO );
TRequestStatus status = iStatus;
iAccessoryConn.NotifyAccessoryConnectionStatusChanged( iStatus, iAccPolGenIdArr );
@@ -328,18 +347,18 @@
// or when audio routing status changes.
if ( audioOutputType == EAccAudioOutPutTypePrivate )
{
- LOG( "CRadioAccessoryObserver::RunL - Headset connected" );
+ LOG( "Headset connected" );
iObserver->HeadsetConnectedCallbackL();
}
else
{
- LOG( "CRadioAccessoryObserver::RunL - Public wired or BT accessory connected." );
+ LOG( "Public wired or BT accessory connected." );
iObserver->HeadsetDisconnectedCallbackL();
}
}
else
{
- LOG( "CRadioAccessoryObserver::RunL - No wired or BT accessories available" );
+ LOG( "No wired or BT accessories available" );
iObserver->HeadsetDisconnectedCallbackL();
}
}
@@ -353,5 +372,6 @@
//
void CRadioAccessoryObserver::DoCancel()
{
+ LEVEL3( LOG_METHOD_AUTO );
iAccessoryConn.CancelNotifyAccessoryConnectionStatusChanged();
}
--- a/radioengine/utils/src/cradioaudiorouter.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradioaudiorouter.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -32,6 +32,7 @@
CRadioAudioRouter::CRadioAudioRouter( MRadioAudioRoutingObserver& aAudioRoutingObserver )
: iAudioRoutingObserver( aAudioRoutingObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -40,6 +41,7 @@
//
EXPORT_C CRadioAudioRouter* CRadioAudioRouter::NewL( MRadioAudioRoutingObserver& aAudioRoutingObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioAudioRouter* self = new( ELeave ) CRadioAudioRouter( aAudioRoutingObserver );
CleanupStack::PushL( self );
self->ConstructL();
@@ -53,6 +55,7 @@
//
EXPORT_C CRadioAudioRouter::~CRadioAudioRouter()
{
+ LEVEL3( LOG_METHOD_AUTO );
iRoutableAudios.Close();
RadioEngineUtils::Release();
}
@@ -64,6 +67,7 @@
void CRadioAudioRouter::ConstructL()
{
RadioEngineUtils::InitializeL();
+ LEVEL3( LOG_METHOD_AUTO );
iRoutableAudios = RArray<CRadioRoutableAudio*>( KVisualRadioInitialRoutableAudioArraySize );
}
@@ -73,7 +77,7 @@
//
EXPORT_C void CRadioAudioRouter::SetAudioRouteL( RadioEngine::TRadioAudioRoute aAudioRoute )
{
- LOG_FORMAT( "CRadioAudioRouter::SetAudioRouteL: Route: %d", aAudioRoute );
+ LEVEL3( LOG_METHOD_AUTO );
for ( TInt i = 0 ; i < iRoutableAudios.Count(); i++ )
{
@@ -88,7 +92,7 @@
//
EXPORT_C void CRadioAudioRouter::RegisterRoutableAudio( CRadioRoutableAudio* aRoutableAudio )
{
- LOG( "CRadioAudioRouter::RegisterRoutableAudio" );
+ LEVEL3( LOG_METHOD_AUTO );
iRoutableAudios.Append( aRoutableAudio );
}
@@ -98,7 +102,7 @@
//
EXPORT_C void CRadioAudioRouter::UnRegisterRoutableAudio( CRadioRoutableAudio* aRoutableAudio )
{
- LOG( "CRadioAudioRouter::UnRegisterRoutableAudio" );
+ LEVEL3( LOG_METHOD_AUTO );
TInt objectIndex = iRoutableAudios.Find( aRoutableAudio );
--- a/radioengine/utils/src/cradioenginetls.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradioenginetls.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -42,11 +42,11 @@
//
// ---------------------------------------------------------------------------
//
-void CRadioEngineTls::InitializeL( CCoeEnv* aEnv, RFs* aFs )
+void CRadioEngineTls::InitializeL( RFs* aFs )
{
if ( !UserSvr::DllTls( KUidRadioEngineTls ) )
{
- CRadioEngineTls* self = new ( ELeave ) CRadioEngineTls( aEnv, aFs );
+ CRadioEngineTls* self = new ( ELeave ) CRadioEngineTls( aFs );
CleanupStack::PushL( self );
self->ConstructL();
User::LeaveIfError( UserSvr::DllSetTls( KUidRadioEngineTls, self ) );
@@ -59,9 +59,8 @@
//
// ---------------------------------------------------------------------------
//
-CRadioEngineTls::CRadioEngineTls( CCoeEnv* aEnv, RFs* aFs )
- : iEnv( aEnv )
- , iFs( aFs )
+CRadioEngineTls::CRadioEngineTls( RFs* aFs )
+ : iFs( aFs )
{
}
@@ -72,18 +71,14 @@
//
void CRadioEngineTls::ConstructL()
{
- if ( !iEnv )
- {
- iEnv = CCoeEnv::Static();
- }
-
- if ( !iFs )
+ if ( !iFs || !iFs->Handle() )
{
iFsOwned = ETrue;
iFs = new ( ELeave ) RFs;
User::LeaveIfError( iFs->Connect() );
}
+
#ifdef LOGGING_ENABLED
iLogger = CRadioEngineLogger::NewL( *iFs );
#endif // LOGGING_ENABLED
@@ -126,16 +121,6 @@
// ---------------------------------------------------------------------------
-// Return the eikon environment
-// ---------------------------------------------------------------------------
-//
-CCoeEnv* CRadioEngineTls::Env()
- {
- return CRadioEngineTls::Instance().iEnv;
- }
-
-
-// ---------------------------------------------------------------------------
// Returns the file server session
// ---------------------------------------------------------------------------
//
--- a/radioengine/utils/src/cradiopropertyobserver.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradiopropertyobserver.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -35,6 +35,7 @@
, iKey( aKey )
, iPropertyType( aPropertyType )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// -----------------------------------------------------------------------------
@@ -43,6 +44,7 @@
//
void CRadioPropertyObserver::ConstructL()
{
+ LEVEL3( LOG_METHOD_AUTO );
switch ( iPropertyType )
{
case ERadioPropertyInt:
@@ -79,6 +81,7 @@
const TUint aKey,
const TRadioPropertyType aPropertyType )
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioPropertyObserver* self = new( ELeave )CRadioPropertyObserver( aObserver,
aCategory, aKey, aPropertyType );
CleanupStack::PushL( self );
@@ -93,6 +96,7 @@
//
CRadioPropertyObserver::~CRadioPropertyObserver()
{
+ LEVEL3( LOG_METHOD_AUTO );
Cancel();
iProperty.Close();
delete iValueByteArray;
@@ -105,6 +109,7 @@
//
EXPORT_C void CRadioPropertyObserver::ActivateL()
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( !IsActive() )
{
RunL();
@@ -117,7 +122,7 @@
//
void CRadioPropertyObserver::RunL()
{
- LOG_METHOD_AUTO;
+ LEVEL3( LOG_METHOD_AUTO );
iProperty.Subscribe( iStatus );
SetActive();
@@ -173,6 +178,7 @@
//
void CRadioPropertyObserver::DoCancel()
{
+ LEVEL3( LOG_METHOD_AUTO );
iProperty.Cancel();
}
@@ -182,6 +188,7 @@
//
EXPORT_C TInt CRadioPropertyObserver::ValueInt() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iValueInt;
}
@@ -191,6 +198,7 @@
//
EXPORT_C const TDesC8& CRadioPropertyObserver::ValueDes8() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iValueByteArray;
}
@@ -200,5 +208,6 @@
//
EXPORT_C const TDesC& CRadioPropertyObserver::ValueDes() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return *iValueText;
}
--- a/radioengine/utils/src/cradiopubsub.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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:
-*
-*/
-
-#include "cradiopubsub.h"
-#include "cradiopubsubimp.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CRadioPubSub* CRadioPubSub::NewL()
- {
- return CRadioPubSubImp::NewL();
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CRadioPubSub::~CRadioPubSub()
- {
- }
--- a/radioengine/utils/src/cradiopubsubimp.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,562 +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:
-*
-*/
-
-#include "radiouid.hrh"
-
-#include "cradioenginelogger.h"
-#include "radiointernalpskeys.h"
-
-#include "mradiocontroleventobserver.h"
-#include "cradiopubsub.h"
-#include "cradiopubsubimp.h"
-#include "radioengineutils.h"
-
-// This has to be the last include.
-#ifdef STUB_CONSTELLATION
-# include "RadioStubManager.h"
-# define KRadioPSUid KStub_KRadioPSUid
-#endif //STUB_CONSTELLATION
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioPubSubImp::CRadioPubSubImp()
- {
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioPubSubImp::ConstructL()
- {
- RadioEngineUtils::InitializeL();
- LOG_METHOD_AUTO;
-
- // Define data properties.
- DefinePropertyL( KRadioPSDataChannel, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataFrequency, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataRadioPowerState, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataVolume, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataChannelDataChanged, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataTuningState, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataRadioMuteState, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataApplicationRunning, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataHeadsetStatus, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataFrequencyDecimalCount, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataLoudspeakerStatus, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataRdsProgramService, RProperty::EText, ETrue );
- DefinePropertyL( KRadioPSDataRdsRadioText, RProperty::EText, ETrue );
- DefinePropertyL( KRadioPSDataChannelName, RProperty::EText, ETrue );
- DefinePropertyL( KRadioPSDataActivePresetListCount, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataActivePresetListFocus, RProperty::EInt, ETrue );
- DefinePropertyL( KRadioPSDataRadioAntennaState, RProperty::EInt, ETrue );
-
- // Define control properties.
- DefinePropertyL( KRadioPSControlStepToChannel, RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlSetChannel, RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlSeek, RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlStepToFrequency, RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlSetFrequency, RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlAdjustVolume , RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlSetRadioMuteState, RProperty::EInt, EFalse );
- DefinePropertyL( KRadioPSControlSetAudioOutput, RProperty::EInt, EFalse );
-
- // Observe control properties.
- CreatePropertyObserverL( KRadioPSControlStepToChannel, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlSetChannel, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlSeek, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlStepToFrequency, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlSetFrequency, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlAdjustVolume, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlSetRadioMuteState, CRadioPropertyObserver::ERadioPropertyInt );
- CreatePropertyObserverL( KRadioPSControlSetAudioOutput, CRadioPropertyObserver::ERadioPropertyInt );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioPubSubImp* CRadioPubSubImp::NewL()
- {
- CRadioPubSubImp* self = new ( ELeave ) CRadioPubSubImp();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioPubSubImp::~CRadioPubSubImp()
- {
- iPropertyArray.ResetAndDestroy();
-
- DeleteProperty( KRadioPSDataChannel );
- DeleteProperty( KRadioPSDataFrequency );
- DeleteProperty( KRadioPSDataRadioPowerState );
- DeleteProperty( KRadioPSDataVolume );
- DeleteProperty( KRadioPSDataChannelDataChanged );
- DeleteProperty( KRadioPSDataTuningState );
- DeleteProperty( KRadioPSDataRadioMuteState );
- DeleteProperty( KRadioPSDataApplicationRunning );
- DeleteProperty( KRadioPSDataHeadsetStatus );
- DeleteProperty( KRadioPSDataFrequencyDecimalCount );
- DeleteProperty( KRadioPSDataLoudspeakerStatus );
- DeleteProperty( KRadioPSDataRdsProgramService );
- DeleteProperty( KRadioPSDataRdsRadioText );
- DeleteProperty( KRadioPSDataChannelName );
- DeleteProperty( KRadioPSDataActivePresetListCount );
- DeleteProperty( KRadioPSDataActivePresetListFocus );
- DeleteProperty( KRadioPSDataRadioAntennaState );
-
- DeleteProperty( KRadioPSControlStepToChannel );
- DeleteProperty( KRadioPSControlSetChannel );
- DeleteProperty( KRadioPSControlSeek );
- DeleteProperty( KRadioPSControlStepToFrequency );
- DeleteProperty( KRadioPSControlSetFrequency );
- DeleteProperty( KRadioPSControlAdjustVolume );
- DeleteProperty( KRadioPSControlSetRadioMuteState );
- DeleteProperty( KRadioPSControlSetAudioOutput );
-
- RadioEngineUtils::Release();
- }
-
-// ---------------------------------------------------------------------------
-// Defines a property.
-// ---------------------------------------------------------------------------
-//
-void CRadioPubSubImp::DefinePropertyL( TUint aKey, TInt aAttr, TBool aDataProperty ) const
- {
- _LIT_SECURITY_POLICY_PASS( KRadioExternalAccessPolicy );
- _LIT_SECURITY_POLICY_S0( KRadioInternalAccessPolicy, KUidRadioApplication );
-
- TInt err = KErrNone;
- if ( aDataProperty )
- {
- // For data properties, grant read access for all, but write access only for radio application
- err = RProperty::Define( KRadioPSUid, aKey, aAttr, KRadioExternalAccessPolicy, KRadioInternalAccessPolicy );
- }
- else
- {
- // For control properties, grant read access only for radio application, but write access for all
- err = RProperty::Define( KRadioPSUid, aKey, aAttr, KRadioInternalAccessPolicy, KRadioExternalAccessPolicy );
- }
-
- if ( err && err != KErrAlreadyExists )
- {
- LOG_FORMAT( "CRadioPubSubImp::DefinePropertyL: Leaving with %d", err );
- User::Leave( err );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Deletes a property
-// ---------------------------------------------------------------------------
-//
-void CRadioPubSubImp::DeleteProperty( TUint aKey ) const
- {
- RProperty::Delete( KRadioPSUid, aKey );
- }
-
-// ---------------------------------------------------------------------------
-// Creates a property observer
-// ---------------------------------------------------------------------------
-//
-void CRadioPubSubImp::CreatePropertyObserverL( const TUint aKey,
- const TInt aPropertyType )
- {
- CRadioPropertyObserver* observer = CRadioPropertyObserver::NewL( *this, KRadioPSUid,
- aKey, static_cast<CRadioPropertyObserver::TRadioPropertyType>( aPropertyType ) );
-
- if ( iPropertyArray.Append( observer ) == KErrNone )
- {
- observer->ActivateL();
- }
- else
- {
- delete observer;
- observer = NULL;
- }
- }
-
-// ---------------------------------------------------------------------------
-// Gets the integer value stored in a property.
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::Get( TUint aKey, TInt& aValue ) const
- {
- return RProperty::Get( KRadioPSUid, aKey, aValue ) == KErrNone;
- }
-
-// ---------------------------------------------------------------------------
-// Sets a property's value.
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::Set( TUint aKey, TInt aValue ) const
- {
- return RProperty::Set( KRadioPSUid, aKey, aValue ) == KErrNone;
- }
-
-// ---------------------------------------------------------------------------
-// Sets a text property value
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::Set( TUint aKey, const TDesC& aValue ) const
- {
- return RProperty::Set( KRadioPSUid, aKey, aValue ) == KErrNone;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioPubSubImp::HandlePropertyChangeL( const TUid& aCategory,
- const TUint aKey,
- const TInt aValue )
- {
- LOG_FORMAT( "CRadioPubSubImp::HandlePropertyChangeL: Category: %d, Key: %u. Value: %d",
- aCategory.iUid, aKey, aValue );
-
- if ( aCategory != KRadioPSUid )
- {
- LOG( "CRadioPubSubImp::HandlePropertyChangeL: Unknown category. Leaving" );
- User::Leave( KErrArgument );
- }
-
- if ( !iObserver )
- {
- return;
- }
-
- if ( aKey == KRadioPSControlStepToChannel )
- {
- if ( aValue == ERadioPSStepToChannelUp )
- {
- iObserver->StepToChannelL( RadioEngine::ERadioUp );
- }
- else if ( aValue == ERadioPSStepToChannelDown )
- {
- iObserver->StepToChannelL( RadioEngine::ERadioDown );
- }
- }
- else if ( aKey == KRadioPSControlSetChannel )
- {
- if ( aValue > 0 )
- {
- iObserver->SetChannelL( aValue );
- }
- }
- else if ( aKey == KRadioPSControlSeek )
- {
- if ( aValue == ERadioPSSeekUp )
- {
- iObserver->SeekL( RadioEngine::ERadioUp );
- }
- else if ( aValue == ERadioPSSeekDown )
- {
- iObserver->SeekL( RadioEngine::ERadioDown );
- }
- }
- else if ( aKey == KRadioPSControlStepToFrequency )
- {
- if ( aValue == ERadioPSStepToFrequencyUp )
- {
- iObserver->StepToFrequencyL( RadioEngine::ERadioUp );
- }
- else if ( aValue == ERadioPSStepToFrequencyDown )
- {
- iObserver->StepToFrequencyL( RadioEngine::ERadioDown );
- }
- }
- else if ( aKey == KRadioPSControlSetFrequency )
- {
- if ( aValue > 0 )
- {
- iObserver->SetFrequencyL( aValue );
- }
- }
- else if ( aKey == KRadioPSControlAdjustVolume )
- {
- if ( aValue == ERadioPSIncreaseVolume )
- {
- iObserver->AdjustVolumeL( RadioEngine::ERadioIncVolume );
- }
- else if ( aValue == ERadioPSDecreaseVolume )
- {
- iObserver->AdjustVolumeL( RadioEngine::ERadioDecVolume );
- }
- }
- else if ( aKey == KRadioPSControlSetRadioMuteState )
- {
- if ( aValue == ERadioPSMuteStateOn )
- {
- iObserver->MuteL( ETrue );
- }
- else if ( aValue == ERadioPSMuteStateOff )
- {
- iObserver->MuteL( EFalse );
- }
- }
- else if ( aKey == KRadioPSControlSetAudioOutput )
- {
- if ( aValue == ERadioPSAudioOutputHeadset )
- {
- iObserver->SetAudioRouteL( RadioEngine::ERadioHeadset );
- }
- else if ( aValue == ERadioPSAudioOutputSpeaker )
- {
- iObserver->SetAudioRouteL( RadioEngine::ERadioSpeaker );
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishChannel( TInt aChannelId ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishChannel ( aChannelId = %d )", aChannelId );
-
- TInt oldChannelId = 0;
- if ( Get( KRadioPSDataChannel, oldChannelId ) && aChannelId != oldChannelId )
- {
- return Set( KRadioPSDataChannel, aChannelId );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishFrequency( TUint32 aFreq ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishFrequency ( aFreq = %u )", aFreq );
-
- TInt oldFreq = 0;
- if ( Get( KRadioPSDataFrequency, oldFreq ) && aFreq != oldFreq )
- {
- return Set( KRadioPSDataFrequency, aFreq );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishPowerState( TBool aPowerOn ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishStateL ( aPowerOn = %d )", aPowerOn );
- // If VR process gets killed, power on state remains published.
- // Must not compare state transition here, because then power on might not be published.
- TRadioPSRadioPowerState newState = aPowerOn ? ERadioPSRadioPowerOn : ERadioPSRadioPowerOff;
- return Set( KRadioPSDataRadioPowerState, newState );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishVolume( TInt aVol ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishVolume ( aVol = %d )", aVol );
-
- TInt oldVol = 0;
- if ( Get( KRadioPSDataVolume, oldVol ) && aVol != oldVol )
- {
- return Set( KRadioPSDataVolume, aVol );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishChannelDataChanged( TInt aChannelId ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishChannelDataChangedL ( aChannelId = %d )", aChannelId );
-
- // Channel data changed notifications are allowed for the same channel multiple times, as the same channel's
- // data can be changed many times in a row.
-
- return Set( KRadioPSDataChannelDataChanged, aChannelId );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishTuningState( TRadioPSTuningState aTuningState ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishSeekingStateL ( aTuningState = %d )", aTuningState );
-
- TInt oldState = 0;
- if ( Get( KRadioPSDataTuningState, oldState ) && aTuningState != oldState )
- {
- return Set( KRadioPSDataTuningState, aTuningState );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishRadioMuteState( TBool aMuted ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishMuteStateL ( aMuted = %d )", aMuted );
-
- TRadioPSRadioMuteState newState = aMuted ? ERadioPSMuteStateOn : ERadioPSMuteStateOff;
-
- TInt oldState = 0;
- if ( Get( KRadioPSDataRadioMuteState, oldState ) && oldState != newState )
- {
- return Set( KRadioPSDataRadioMuteState, newState );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishApplicationRunningState( TRadioPSApplicationRunningState aRunningState ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishApplicationRunningStateL ( aRunningState = %d )", aRunningState );
- // If VR process gets killed, wrong running state remains published.
- // Must not compare state transition here, because then application start might not be published.
- return Set( KRadioPSDataApplicationRunning, aRunningState );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishHeadsetStatus( TRadioPSHeadsetStatus aHeadsetStatus ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishHeadsetStatusL ( aHeadsetStatus = %d )", aHeadsetStatus );
-
- TInt oldStatus = 0;
- if ( Get( KRadioPSDataHeadsetStatus, oldStatus ) && aHeadsetStatus != oldStatus )
- {
- return Set( KRadioPSDataHeadsetStatus, aHeadsetStatus );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishFrequencyDecimalCount( TRadioPSFrequencyDecimalCount aDecimalCount ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishFrequencyDecimalCountL ( aDecimalCount = %d )", aDecimalCount );
-
- TInt oldCount = 0;
- if ( Get( KRadioPSDataFrequencyDecimalCount, oldCount ) && aDecimalCount != oldCount )
- {
- return Set( KRadioPSDataFrequencyDecimalCount, aDecimalCount );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishLoudspeakerStatus( TRadioPSLoudspeakerStatus aLoudspeakerStatus ) const
- {
- LOG_FORMAT( "CRadioPubSubImp::PublishLoudspeakerStatusL ( aLoudspeakerStatus = %d )", aLoudspeakerStatus );
- TInt oldStatus = 0;
- if ( Get( KRadioPSDataLoudspeakerStatus, oldStatus ) && oldStatus != aLoudspeakerStatus )
- {
- return Set( KRadioPSDataLoudspeakerStatus, aLoudspeakerStatus );
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishRdsProgramService( const TDesC& aProgramService ) const
- {
- return Set( KRadioPSDataRdsProgramService, aProgramService );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishRdsRadioText( const TDesC& aRadioText ) const
- {
- return Set( KRadioPSDataRdsRadioText, aRadioText );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishChannelName( const TDesC& aName ) const
- {
- return Set( KRadioPSDataChannelName, aName );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishActivePreseListCount( TInt aCount ) const
- {
- return Set( KRadioPSDataActivePresetListCount, aCount );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishActivePreseListFocus( TInt aIndex ) const
- {
- return Set( KRadioPSDataActivePresetListFocus, aIndex );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioPubSubImp::PublishAntennaState( TRadioPSRadioAntennaState aState ) const
- {
- return Set( KRadioPSDataRadioAntennaState, aState );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioPubSubImp::SetControlEventObserver( MRadioControlEventObserver* aControlEventObserver )
- {
- iObserver = aControlEventObserver;
- }
--- a/radioengine/utils/src/cradioremcontarget.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradioremcontarget.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -19,6 +19,7 @@
// User includes
#include "cradioremcontarget.h"
#include "cradioremcontargetimp.h"
+#include "cradioenginelogger.h"
// ================= MEMBER FUNCTIONS =======================
@@ -29,6 +30,7 @@
//
EXPORT_C CRadioRemConTarget* CRadioRemConTarget::NewL()
{
+ LEVEL3( LOG_METHOD_AUTO );
return CRadioRemConTargetImp::NewL();
}
@@ -38,4 +40,5 @@
//
CRadioRemConTarget::~CRadioRemConTarget()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
--- a/radioengine/utils/src/cradioremcontargetimp.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradioremcontargetimp.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -37,6 +37,7 @@
//
CRadioRemConTargetImp::CRadioRemConTargetImp()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -45,6 +46,7 @@
//
void CRadioRemConTargetImp::ConstructL()
{
+ LEVEL3( LOG_METHOD_AUTO );
RadioEngineUtils::InitializeL();
// Create interface selector.
iInterfaceSelector = CRemConInterfaceSelector::NewL();
@@ -64,6 +66,7 @@
//
CRadioRemConTargetImp* CRadioRemConTargetImp::NewL()
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioRemConTargetImp* self = new ( ELeave ) CRadioRemConTargetImp();
CleanupStack::PushL( self );
self->ConstructL();
@@ -77,6 +80,7 @@
//
CRadioRemConTargetImp::~CRadioRemConTargetImp()
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( iRepeatTimer )
{
iRepeatTimer->Cancel();
@@ -94,6 +98,7 @@
//
void CRadioRemConTargetImp::SetControlEventObserver( MRadioControlEventObserver* aControlEventObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
iObserver = aControlEventObserver;
}
@@ -104,7 +109,8 @@
void CRadioRemConTargetImp::MrccatoCommand( TRemConCoreApiOperationId aOperationId,
TRemConCoreApiButtonAction aButtonAct )
{
- LOG_FORMAT( "CRadioRemConTargetImp::MrccatoCommand ( aOperationId = %d, aButtonAct = %d )", aOperationId, aButtonAct );
+ LOG_METHOD_AUTO;
+ LOG_FORMAT( "aOperationId = %d, aButtonAct = %d", aOperationId, aButtonAct );
//TODO: Refactor
if ( iObserver )
{
@@ -261,7 +267,7 @@
void CRadioRemConTargetImp::MrccatoPlay( TRemConCoreApiPlaybackSpeed /*aSpeed*/,
TRemConCoreApiButtonAction aButtonAct )
{
- LOG( "CRadioRemConTargetImp::MrccatoPlay" );
+ LOG_METHOD_AUTO;
if ( iObserver )
{
if ( aButtonAct == ERemConCoreApiButtonClick )
@@ -280,7 +286,7 @@
TUint /*aMinorChannel*/,
TRemConCoreApiButtonAction /*aButtonAct*/)
{
- LOG( "CRadioRemConTargetImp::MrccatoTuneFunction ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -290,7 +296,7 @@
void CRadioRemConTargetImp::MrccatoSelectDiskFunction( TUint /*aDisk*/,
TRemConCoreApiButtonAction /*aButtonAct*/)
{
- LOG( "CRadioRemConTargetImp::MrccatoSelectDiskFunction ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -300,7 +306,7 @@
void CRadioRemConTargetImp::MrccatoSelectAvInputFunction( TUint8 /*aAvInputSignalNumber*/,
TRemConCoreApiButtonAction /*aButtonAct*/)
{
- LOG( "CRadioRemConTargetImp::MrccatoSelectAvInputFunction ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -310,7 +316,7 @@
void CRadioRemConTargetImp::MrccatoSelectAudioInputFunction( TUint8 /*aAudioInputSignalNumber*/,
TRemConCoreApiButtonAction /*aButtonAct*/)
{
- LOG( "CRadioRemConTargetImp::MrccatoSelectAudioInputFunction ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -319,7 +325,7 @@
//
TInt CRadioRemConTargetImp::RepeatTimerCallback( TAny* aPtr )
{
- LOG( "CRadioRemConTargetImp::RepeatTimerCallback" );
+ LEVEL3( LOG_METHOD_AUTO );
CRadioRemConTargetImp* self = reinterpret_cast<CRadioRemConTargetImp*>( aPtr );
@@ -356,7 +362,8 @@
//
void CRadioRemConTargetImp::AnswerCall()
{
- LOG( "CRadioRemConTargetImp::AnswerCall() ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
+ LOG( "This function currently unsupported." );
}
// ---------------------------------------------------------------------------
@@ -365,7 +372,7 @@
//
void CRadioRemConTargetImp::AnswerEndCall()
{
- LOG( "CRadioRemConTargetImp::AnswerEndCall() " );
+ LEVEL3( LOG_METHOD_AUTO );
if ( iObserver )
{
TRAP_IGNORE( iObserver->AnswerEndCallL())
@@ -378,7 +385,7 @@
//
void CRadioRemConTargetImp::DialCall( const TDesC8& /*aTelNumber*/ )
{
- LOG( "CRadioRemConTargetImp::DialCall ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -387,7 +394,7 @@
//
void CRadioRemConTargetImp::EndCall()
{
- LOG( "CRadioRemConTargetImp::EndCall() ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -396,7 +403,7 @@
//
void CRadioRemConTargetImp::GenerateDTMF( const TChar /*aChar*/ )
{
- LOG( "CRadioRemConTargetImp::GenerateDTMF ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -405,7 +412,7 @@
//
void CRadioRemConTargetImp::LastNumberRedial()
{
- LOG( "CRadioRemConTargetImp::LastNumberRedial ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -414,7 +421,7 @@
//
void CRadioRemConTargetImp::MultipartyCalling( const TDesC8& /*aData*/ )
{
- LOG( "CRadioRemConTargetImp::MultipartyCalling ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -423,7 +430,7 @@
//
void CRadioRemConTargetImp::SpeedDial( const TInt /*aIndex*/ )
{
- LOG( "CRadioRemConTargetImp::SpeedDial ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -432,5 +439,5 @@
//
void CRadioRemConTargetImp::VoiceDial( const TBool /*aActivate*/ )
{
- LOG( "CRadioRemConTargetImp::VoiceDial ( currently unsupported in Visual Radio )" );
+ LEVEL3( LOG_METHOD_AUTO );
}
--- a/radioengine/utils/src/cradiorepositoryentitybase.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradiorepositoryentitybase.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -16,6 +16,7 @@
*/
#include "cradiorepositoryentitybase.h"
+#include "cradioenginelogger.h"
// ======== MEMBER FUNCTIONS ========
@@ -23,20 +24,22 @@
//
// ---------------------------------------------------------------------------
//
-CRadioRepositoryEntityBase::CRadioRepositoryEntityBase( const TUid& aUid,
+EXPORT_C CRadioRepositoryEntityBase::CRadioRepositoryEntityBase( const TUid& aUid,
TUint32 aKey,
MRadioRepositoryEntityObserver& aObserver,
CActive::TPriority aPriority )
: CActive( aPriority ), iObserver( aObserver ), iUid( aUid ), iKey( aKey )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
//
-CRadioRepositoryEntityBase::~CRadioRepositoryEntityBase()
+EXPORT_C CRadioRepositoryEntityBase::~CRadioRepositoryEntityBase()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -54,5 +57,6 @@
//
TUint32 CRadioRepositoryEntityBase::Key() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iKey;
}
--- a/radioengine/utils/src/cradiorepositorymanager.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +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:
-*
-*/
-
-#include "cradiorepositorymanager.h"
-#include "cradiorepositorymanagerimp.h"
-#include "radioengineutils.h"
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CRadioRepositoryManager* CRadioRepositoryManager::NewL( TInt aGranularity )
- {
- return CRadioRepositoryManagerImp::NewL( aGranularity );
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CRadioRepositoryManager::~CRadioRepositoryManager()
- {
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, TInt aValue )
- {
- CRadioRepositoryManagerImp::SetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TReal& aValue )
- {
- CRadioRepositoryManagerImp::SetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TDesC8& aValue )
- {
- CRadioRepositoryManagerImp::SetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TDesC16& aValue )
- {
- CRadioRepositoryManagerImp::SetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TInt& aValue )
- {
- CRadioRepositoryManagerImp::GetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TReal& aValue )
- {
- CRadioRepositoryManagerImp::GetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TDes8& aValue )
- {
- CRadioRepositoryManagerImp::GetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CRadioRepositoryManager::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TDes16& aValue )
- {
- CRadioRepositoryManagerImp::GetRepositoryValueL( aUid, aKey, aValue );
- }
--- a/radioengine/utils/src/cradiorepositorymanagerimp.cpp Fri Jun 04 10:21:36 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,454 +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:
-*
-*/
-
-#include "cradiorepositoryentity.h"
-#include "cradiorepositorymanager.h"
-#include "cradiorepositorymanagerimp.h"
-#include "radioengineutils.h"
-
-const TInt KVRRepositoryObserverArrayGranularity = 2;
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// Panics the application.
-// ---------------------------------------------------------------------------
-//
-void Panic( TInt aReason )
- {
- _LIT( category, "CRadioRepositoryManagerImp" );
- User::Panic( category, aReason );
- }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioRepositoryManagerImp* CRadioRepositoryManagerImp::NewL( TInt aGranularity )
- {
- CRadioRepositoryManagerImp* self = new ( ELeave ) CRadioRepositoryManagerImp( aGranularity );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::ConstructL()
- {
- RadioEngineUtils::InitializeL();
- CheckRepositoryKeysL();
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioRepositoryManagerImp::CRadioRepositoryManagerImp( TInt aGranularity )
- : iObservers( KVRRepositoryObserverArrayGranularity )
- , iEntities( aGranularity )
- , iEnableSave( ETrue )
- {
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioRepositoryManagerImp::~CRadioRepositoryManagerImp()
- {
- iObservers.Close();
- iEntities.ResetAndDestroy();
- RadioEngineUtils::Release();
- }
-
-// ---------------------------------------------------------------------------
-// Adds observer
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::AddObserverL( MRadioRepositoryEntityObserver* aObserver )
- {
- iObservers.AppendL( aObserver );
- }
-
-// ---------------------------------------------------------------------------
-// Removes observer
-// ---------------------------------------------------------------------------
-//
- void CRadioRepositoryManagerImp::RemoveObserver( MRadioRepositoryEntityObserver* aObserver )
- {
- TInt objectIndex = iObservers.Find( aObserver );
-
- if ( objectIndex != KErrNotFound )
- {
- iObservers.Remove( objectIndex );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Enables or disables the saving of entities.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::EnableSave( TBool aEnable )
- {
- iEnableSave = aEnable;
- }
-
-// ---------------------------------------------------------------------------
-// Adds an entity.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::AddEntityL( const TUid& aUid, TUint32 aKey, TRadioEntityType aType )
- {
- CRadioRepositoryEntityBase* entity = NULL;
-
- switch ( aType )
- {
- case ERadioEntityInt:
- entity = CRadioRepositoryEntity<TInt>::NewL( aUid, aKey, *this );
- break;
- case ERadioEntityReal:
- entity = CRadioRepositoryEntity<TReal>::NewL( aUid, aKey, *this );
- break;
- case ERadioEntityDes8:
- entity = CRadioRepositoryEntity<TRadioEntityBuf8>::NewL( aUid, aKey, *this );
- break;
- case ERadioEntityDes16:
- entity = CRadioRepositoryEntity<TRadioEntityBuf16>::NewL( aUid, aKey, *this );
- break;
- default:
- User::Leave( KErrNotSupported );
- break;
- }
-
- CleanupStack::PushL( entity );
- iEntities.AppendL( entity );
- CleanupStack::Pop( entity );
- }
-
-// ---------------------------------------------------------------------------
-// Removes an entity.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::RemoveEntity( const TUid& aUid, TUint32 aKey )
- {
- TInt idx = EntityIndex( aUid, aKey );
-
- if ( idx >= 0 )
- {
- CRadioRepositoryEntityBase* entity = iEntities[idx];
- iEntities.Remove( idx );
- iEntities.GranularCompress();
- delete entity;
- }
- }
-
-// ---------------------------------------------------------------------------
-// Sets an entity's value.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRepositoryManagerImp::SetEntityValue( const TUid& aUid, TUint32 aKey, TInt aValue )
- {
- return DoSetEntityValue<TInt>( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets an entity's value.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRepositoryManagerImp::SetEntityValue( const TUid& aUid, TUint32 aKey, const TReal& aValue )
- {
- return DoSetEntityValue<TReal>( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets an entity's value.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRepositoryManagerImp::SetEntityValue( const TUid& aUid, TUint32 aKey, const TDesC8& aValue )
- {
- return DoSetEntityValue<TRadioEntityBuf8>( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets an entity's value.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRepositoryManagerImp::SetEntityValue( const TUid& aUid, TUint32 aKey, const TDesC16& aValue )
- {
- return DoSetEntityValue<TRadioEntityBuf16>( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Returns an entity's value.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRepositoryManagerImp::EntityValueInt( const TUid& aUid, TUint32 aKey ) const
- {
- return DoEntityValue<TInt>( aUid, aKey );
- }
-
-// ---------------------------------------------------------------------------
-// Returns an entity's value.
-// ---------------------------------------------------------------------------
-//
-const TReal& CRadioRepositoryManagerImp::EntityValueReal( const TUid& aUid, TUint32 aKey ) const
- {
- return DoEntityValue<TReal>( aUid, aKey );
- }
-
-// ---------------------------------------------------------------------------
-// Returns an entity's value.
-// ---------------------------------------------------------------------------
-//
-const TDesC8& CRadioRepositoryManagerImp::EntityValueDes8( const TUid& aUid, TUint32 aKey ) const
- {
- return DoEntityValue<TDesC8>( aUid, aKey );
- }
-
-// ---------------------------------------------------------------------------
-// Returns an entity's value.
-// ---------------------------------------------------------------------------
-//
-const TDesC16& CRadioRepositoryManagerImp::EntityValueDes16( const TUid& aUid, TUint32 aKey ) const
- {
- return DoEntityValue<TDesC16>( aUid, aKey );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, TInt aValue )
- {
- DoSetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TReal& aValue )
- {
- DoSetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TDesC8& aValue )
- {
- DoSetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::SetRepositoryValueL( const TUid& aUid, TUint32 aKey, const TDesC16& aValue )
- {
- DoSetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TInt& aValue )
- {
- DoGetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TReal& aValue )
- {
- DoGetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TDes8& aValue )
- {
- DoGetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the value of a repository key.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::GetRepositoryValueL( const TUid& aUid, TUint32 aKey, TDes16& aValue )
- {
- DoGetRepositoryValueL( aUid, aKey, aValue );
- }
-
-// ---------------------------------------------------------------------------
-// Sets an entity's value.
-// ---------------------------------------------------------------------------
-//
-template <typename T>
-TInt CRadioRepositoryManagerImp::DoSetEntityValue( const TUid& aUid, TUint32 aKey, const T& aValue )
- {
- TInt idx = EntityIndex( aUid, aKey );
-
- // If the entity could not be found, panic the application.
- __ASSERT_ALWAYS( idx >= 0, ::Panic( KErrArgument ) );
-
- return static_cast<CRadioRepositoryEntity<T>*>( iEntities[idx] )->SetValue( aValue, iEnableSave );
- }
-
-// ---------------------------------------------------------------------------
-// Returns an entity's value.
-// ---------------------------------------------------------------------------
-//
-template <typename T>
-const T& CRadioRepositoryManagerImp::DoEntityValue( const TUid& aUid, TUint32 aKey ) const
- {
- TInt idx = EntityIndex( aUid, aKey );
-
- // If the entity could not be found, panic the application.
- __ASSERT_ALWAYS( idx >= 0, ::Panic( KErrArgument ) );
-
- return static_cast<CRadioRepositoryEntity<T>*>( iEntities[idx] )->Value();
- }
-
-// ---------------------------------------------------------------------------
-// Sets a key's value in the repository.
-// ---------------------------------------------------------------------------
-//
-template <typename T>
-void CRadioRepositoryManagerImp::DoSetRepositoryValueL( const TUid& aUid, TUint32 aKey, const T& aValue )
- {
- CRepository* repository = CRepository::NewLC( aUid );
- User::LeaveIfError( repository->Set( aKey, aValue ) );
- CleanupStack::PopAndDestroy( repository );
- }
-
-// ---------------------------------------------------------------------------
-// Returns a key's value in the repository.
-// ---------------------------------------------------------------------------
-//
-template <typename T>
-void CRadioRepositoryManagerImp::DoGetRepositoryValueL( const TUid& aUid, TUint32 aKey, T& aValue )
- {
- CRepository* repository = CRepository::NewLC( aUid );
- User::LeaveIfError( repository->Get( aKey, aValue ) );
- CleanupStack::PopAndDestroy( repository );
- }
-
-// ---------------------------------------------------------------------------
-// Returns the entity's index that matches the supplied arguments.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioRepositoryManagerImp::EntityIndex( const TUid& aUid, TUint32 aKey ) const
- {
- TInt idx = KErrNotFound;
-
- for ( TInt i = 0; i < iEntities.Count(); i++ )
- {
- CRadioRepositoryEntityBase* entity = iEntities[i];
- if ( entity->Uid() == aUid && entity->Key() == aKey )
- {
- idx = i;
- break;
- }
- }
-
- return idx;
- }
-
-// ---------------------------------------------------------------------------
-// SIS installation does not update central repository, this checks that the new keys are in the repository.
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::CheckRepositoryKeysL()
- {
- // After adding a new cenrep key to radiointernalcrkeys.h, add it also here with a default value
- /*
- CRepository* repository = CRepository::NewLC( KVRCRUid );
-
- TInt ret = repository->Create( KVRCRNewValue, TInt( 123 ) );
- if ( ret != KErrAlreadyExists )
- {
- User::LeaveIfError( ret );
- }
-
- CleanupStack::PopAndDestroy( repository );
- */
- }
-
-// ---------------------------------------------------------------------------
-// Forwards the repository value changes
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::HandleRepositoryValueChangeL( const TUid& aUid,
- TUint32 aKey, TInt aValue, TInt aError )
- {
- for ( TInt i = 0; i < iObservers.Count(); i++ )
- {
- iObservers[i]->HandleRepositoryValueChangeL( aUid, aKey, aValue, aError );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Forwards the repository value changes
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::HandleRepositoryValueChangeL( const TUid& aUid,
- TUint32 aKey, const TReal& aValue, TInt aError )
- {
- for ( TInt i = 0; i < iObservers.Count(); i++ )
- {
- iObservers[i]->HandleRepositoryValueChangeL( aUid, aKey, aValue, aError );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Forwards the repository value changes
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::HandleRepositoryValueChangeL( const TUid& aUid,
- TUint32 aKey, const TDesC8& aValue, TInt aError )
- {
- for ( TInt i = 0; i < iObservers.Count(); i++ )
- {
- iObservers[i]->HandleRepositoryValueChangeL( aUid, aKey, aValue, aError );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Forwards the repository value changes
-// ---------------------------------------------------------------------------
-//
-void CRadioRepositoryManagerImp::HandleRepositoryValueChangeL( const TUid& aUid,
- TUint32 aKey, const TDesC16& aValue, TInt aError )
- {
- for ( TInt i = 0; i < iObservers.Count(); i++ )
- {
- iObservers[i]->HandleRepositoryValueChangeL( aUid, aKey, aValue, aError );
- }
- }
--- a/radioengine/utils/src/cradioroutableaudio.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradioroutableaudio.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -21,6 +21,7 @@
// User includes
#include "cradioroutableaudio.h"
#include "cradioaudiorouter.h"
+#include "cradioenginelogger.h"
// ---------------------------------------------------------------------------
@@ -30,6 +31,7 @@
EXPORT_C CRadioRoutableAudio::CRadioRoutableAudio( CRadioAudioRouter* aAudioRouter )
: iAudioRouter( aAudioRouter )
{
+ LEVEL3( LOG_METHOD_AUTO );
iAudioRouter->RegisterRoutableAudio( this );
}
@@ -51,6 +53,7 @@
//
EXPORT_C void CRadioRoutableAudio::SetAudioOutput( CAudioOutput* aAudioOutput )
{
+ LEVEL3( LOG_METHOD_AUTO );
delete iAudioOutput;
iAudioOutput = aAudioOutput;
}
@@ -61,6 +64,7 @@
//
EXPORT_C void CRadioRoutableAudio::DeleteAudioOutput()
{
+ LEVEL3( LOG_METHOD_AUTO );
delete iAudioOutput;
iAudioOutput = NULL;
}
@@ -71,6 +75,7 @@
//
EXPORT_C void CRadioRoutableAudio::SetAudioRouteL( RadioEngine::TRadioAudioRoute aRoute )
{
+ LEVEL3( LOG_METHOD_AUTO );
if ( iAudioOutput )
{
iAudioOutput->SetAudioOutputL( aRoute == RadioEngine::ERadioSpeaker ? CAudioOutput::EPublic
@@ -84,6 +89,7 @@
//
EXPORT_C TBool CRadioRoutableAudio::AudioRoutingSupported() const
{
+ LEVEL3( LOG_METHOD_AUTO );
#ifdef __WINS__
return ETrue;
#else
--- a/radioengine/utils/src/cradiosystemeventcollector.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradiosystemeventcollector.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -18,6 +18,7 @@
// User includes
#include "cradiosystemeventcollector.h"
#include "cradiosystemeventcollectorimp.h"
+#include "cradioenginelogger.h"
// ======== MEMBER FUNCTIONS ========
@@ -28,6 +29,7 @@
//
EXPORT_C CRadioSystemEventCollector* CRadioSystemEventCollector::NewL()
{
+ LEVEL3( LOG_METHOD_AUTO );
return CRadioSystemEventCollectorImp::NewL();
}
@@ -37,4 +39,5 @@
//
EXPORT_C CRadioSystemEventCollector::~CRadioSystemEventCollector()
{
+ LEVEL3( LOG_METHOD_AUTO );
}
--- a/radioengine/utils/src/cradiosystemeventcollectorimp.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradiosystemeventcollectorimp.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -17,7 +17,6 @@
// System includes
#include <e32cmn.h>
-#include <UiklafInternalCRKeys.h>
// User includes
#include "cradioaccessoryobserver.h"
@@ -36,6 +35,7 @@
CRadioSystemEventCollectorImp::CRadioSystemEventCollectorImp() :
iSystemEventObservers( KVRObserverArrayGranularity )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -44,15 +44,12 @@
//
void CRadioSystemEventCollectorImp::ConstructL()
{
+ LEVEL3( LOG_METHOD_AUTO );
RadioEngineUtils::InitializeL();
iSystemEventDetector = CRadioSystemEventDetector::NewL( *this );
iHeadsetObserver = CRadioAccessoryObserver::NewL();
iHeadsetObserver->SetObserver( this );
-
- TInt criticalLevel;
- CRadioRepositoryManager::GetRepositoryValueL( KCRUidUiklaf,
- KUikOODDiskCriticalThreshold, criticalLevel );
}
// ---------------------------------------------------------------------------
@@ -61,6 +58,7 @@
//
CRadioSystemEventCollectorImp* CRadioSystemEventCollectorImp::NewL()
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioSystemEventCollectorImp* self = new( ELeave ) CRadioSystemEventCollectorImp;
CleanupStack::PushL( self );
self->ConstructL();
@@ -74,6 +72,7 @@
//
CRadioSystemEventCollectorImp::~CRadioSystemEventCollectorImp()
{
+ LEVEL3( LOG_METHOD_AUTO );
delete iSystemEventDetector;
delete iHeadsetObserver;
@@ -87,6 +86,7 @@
//
void CRadioSystemEventCollectorImp::AddObserverL( MRadioSystemEventObserver* aHeadsetObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
iSystemEventObservers.AppendL( aHeadsetObserver );
}
@@ -96,6 +96,7 @@
//
void CRadioSystemEventCollectorImp::RemoveObserver( MRadioSystemEventObserver* aSystemObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
TInt objectIndex = iSystemEventObservers.Find( aSystemObserver );
if ( objectIndex != KErrNotFound )
@@ -110,6 +111,7 @@
//
TBool CRadioSystemEventCollectorImp::IsMobileNetworkCoverage() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iSystemEventDetector->IsMobileNetworkCoverage();
}
@@ -119,6 +121,7 @@
//
TBool CRadioSystemEventCollectorImp::IsNetworkCoverage() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iSystemEventDetector->IsNetworkCoverage();
}
@@ -128,6 +131,7 @@
//
TBool CRadioSystemEventCollectorImp::IsCallActive() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iSystemEventDetector->IsCallActive();
}
@@ -137,6 +141,7 @@
//
TBool CRadioSystemEventCollectorImp::IsAudioResourcesAvailable() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iSystemEventDetector->IsAudioResourcesAvailable();
}
@@ -145,23 +150,17 @@
// ---------------------------------------------------------------------------
TBool CRadioSystemEventCollectorImp::IsHeadsetConnectedL() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iHeadsetObserver->IsHeadsetConnectedL();
}
// ---------------------------------------------------------------------------
-// Getter Vocie UI state
-// ---------------------------------------------------------------------------
-TBool CRadioSystemEventCollectorImp::IsVoiceUiActive() const
- {
- return iSystemEventDetector->IsVoiceUiActive();
- }
-
-// ---------------------------------------------------------------------------
// Notifies the observers of system event
// ---------------------------------------------------------------------------
//
void CRadioSystemEventCollectorImp::NotifyObserversL( TRadioSystemEventType aEvent )
{
+ LEVEL3( LOG_METHOD_AUTO );
for ( TInt i = 0; i < iSystemEventObservers.Count(); ++i )
{
iSystemEventObservers[i]->HandleSystemEventL( aEvent );
@@ -174,6 +173,7 @@
//
void CRadioSystemEventCollectorImp::NetworkUpCallbackL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioNetworkCoverageUp );
}
@@ -183,6 +183,7 @@
//
void CRadioSystemEventCollectorImp::NetworkDownCallbackL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioNetworkCoverageDown );
}
@@ -192,6 +193,7 @@
//
void CRadioSystemEventCollectorImp::CallActivatedCallbackL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioCallActivated );
}
@@ -201,6 +203,7 @@
//
void CRadioSystemEventCollectorImp::CallDeactivatedCallbackL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioCallDeactivated );
}
@@ -210,6 +213,7 @@
//
void CRadioSystemEventCollectorImp::AudioResourcesAvailableL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioAudioResourcesAvailable );
}
@@ -219,6 +223,7 @@
//
void CRadioSystemEventCollectorImp::AudioAutoResumeForbiddenL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioAudioAutoResumeForbidden );
}
@@ -226,9 +231,10 @@
// From class MRadioSystemEventDetectorObserver.
// ---------------------------------------------------------------------------
//
-void CRadioSystemEventCollectorImp::ErrorCallbackL( TInt DEBUGVAR( aError ) )
+void CRadioSystemEventCollectorImp::ErrorCallbackL( TInt DEBUGVAR3( aError ) )
{
- LOG_FORMAT( "CRadioSystemEventCollectorImp::ErrorCallbackL - %d", aError );
+ LEVEL3( LOG_METHOD_AUTO );
+ LEVEL3( LOG_FORMAT( "aError = %d", aError ) );
// P&S get fail not considered as a critical issue.
}
@@ -238,6 +244,7 @@
//
void CRadioSystemEventCollectorImp::HeadsetConnectedCallbackL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioHeadsetConnected );
}
@@ -247,6 +254,7 @@
//
void CRadioSystemEventCollectorImp::HeadsetDisconnectedCallbackL()
{
+ LEVEL3( LOG_METHOD_AUTO );
NotifyObserversL( ERadioHeadsetDisconnected );
}
@@ -256,6 +264,7 @@
//
void CRadioSystemEventCollectorImp::AudioRouteChangedL( RadioEngine::TRadioAudioRoute aRoute )
{
+ LEVEL3( LOG_METHOD_AUTO );
TRadioSystemEventType ev = ERadioAudioRouteHeadset;
if ( aRoute != RadioEngine::ERadioHeadset )
{
--- a/radioengine/utils/src/cradiosystemeventdetector.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/cradiosystemeventdetector.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -30,11 +30,6 @@
#include <publicruntimeids.hrh>
#include <sacls.h>
-#ifdef COMPILE_IN_IVALO
-# include <voiceuidomainpskeys.h>
-#endif //COMPILE_IN_IVALO
-#include <featmgr.h>
-
// User includes
#include "cradioenginelogger.h"
#include "cradiosystemeventdetector.h"
@@ -61,11 +56,10 @@
CRadioSystemEventDetector::CRadioSystemEventDetector( MRadioSystemEventDetectorObserver& aObserver )
: iObserver( aObserver )
, iIsMobileNetworkCoverage( EFalse )
- , iIsWlanCoverage( EFalse )
, iIsCallActive( EFalse )
, iIsAudioResourcesAvailable( ETrue )
- , iIsVoiceUiActive( EFalse )
{
+ LEVEL3( LOG_METHOD_AUTO );
}
// ---------------------------------------------------------------------------
@@ -74,11 +68,7 @@
//
void CRadioSystemEventDetector::ConstructL()
{
-// FeatureManager::InitializeLibL();
-// TBool wlanSupported = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
-// FeatureManager::UnInitializeLib();
- TBool wlanSupported = EFalse; //TODO: Check if we have any need for this
-
+ LOG_METHOD_AUTO;
iNetworkStatusObserver = CRadioPropertyObserver::NewL( *this,
KUidSystemCategory,
KUidNetworkStatusValue,
@@ -87,12 +77,6 @@
iIsMobileNetworkCoverage = iNetworkStatusObserver->ValueInt() == ESANetworkAvailable;
- // On S60 platform, there is no guaranteed way of seeing whether WLAN is explicitly turned off
- // in the settings, or whether the network is available. For now, we only check the existence of
- // the WLAN support in the feature manager. We might also want to check whether WLAN access points
- // have been configured.
- iIsWlanCoverage = wlanSupported;
-
// Initialize call state observer.
iCallStatusObserver = CRadioPropertyObserver::NewL( *this,
KPSUidCtsyCallInformation,
@@ -101,15 +85,6 @@
iCallStatusObserver->ActivateL();
iIsCallActive = iCallStatusObserver->ValueInt() != EPSCTsyCallStateNone;
-#ifdef COMPILE_IN_IVALO
- // Initialize voice ui observer.
- iVoiceUiObserver = CRadioPropertyObserver::NewL( *this,
- KPSUidVoiceUiAccMonitor,
- KVoiceUiOpenKey,
- CRadioPropertyObserver::ERadioPropertyInt );
- iVoiceUiObserver->ActivateL();
-#endif //COMPILE_IN_IVALO
-
#ifndef __WINS__
// Define audio types for not resuming.
iNoAutoResumeAudioCategories = RArray<TInt>( KVRAudioCategoryArrayGranularity );
@@ -129,10 +104,9 @@
//
CRadioSystemEventDetector::~CRadioSystemEventDetector()
{
- FeatureManager::UnInitializeLib();
+ LEVEL3( LOG_METHOD_AUTO );
delete iCallStatusObserver;
delete iNetworkStatusObserver;
- delete iVoiceUiObserver;
delete iAudioPolicyObserver;
iNoAutoResumeAudioCategories.Close();
@@ -144,6 +118,7 @@
//
CRadioSystemEventDetector* CRadioSystemEventDetector::NewL( MRadioSystemEventDetectorObserver& aObserver )
{
+ LEVEL3( LOG_METHOD_AUTO );
CRadioSystemEventDetector* self = new ( ELeave ) CRadioSystemEventDetector( aObserver );
CleanupStack::PushL( self );
self->ConstructL();
@@ -161,28 +136,8 @@
const TUint aKey,
const TInt aValue )
{
- //TODO: Refactor
- if ( aCategory == KUidSystemCategory && aKey == KUidNetworkStatusValue )
- {
- switch ( aValue )
- {
- case ESANetworkAvailable:
- {
- SetNetworkCoverageL( ETrue, iIsWlanCoverage );
- break;
- }
- case ESANetworkUnAvailable:
- {
- SetNetworkCoverageL( EFalse, iIsWlanCoverage );
- break;
- }
- default:
- {
- break;
- }
- }
- }
- else if ( aCategory == KPSUidCtsyCallInformation && aKey == KCTsyCallState )
+ LEVEL2( LOG_METHOD_AUTO );
+ if ( aCategory == KPSUidCtsyCallInformation && aKey == KCTsyCallState )
{
if ( (!iIsCallActive ) && ( aValue > EPSCTsyCallStateNone ))
{
@@ -194,48 +149,6 @@
iIsCallActive = EFalse;
iObserver.CallDeactivatedCallbackL();
}
- else
- {
- // No change
- }
- }
-#ifdef COMPILE_IN_IVALO
- else if ( aCategory == KPSUidVoiceUiAccMonitor && aKey == KVoiceUiOpenKey )
- {
- switch ( aValue )
- {
- case KVoiceUiIsClose:
- {
- if ( iIsVoiceUiActive )
- {
- iIsVoiceUiActive = EFalse;
- LOG( "Voice UI not active." );
- if ( iIsAudioResourcesAvailable )
- {
- LOG( "Audio resources available. Change informed." );
- iObserver.AudioResourcesAvailableL();
- }
- }
- break;
- }
- case KVoiceUiIsOpen:
- {
- if ( !iIsVoiceUiActive )
- {
- iIsVoiceUiActive = ETrue;
- LOG( "Voice UI active." );
- }
- break;
- }
- default:
- {
- break;
- }
- }
- }
-#endif //COMPILE_IN_IVALO
- else // NOP
- {
}
}
@@ -251,7 +164,7 @@
const TDesC8& aValue )
{
#if 0
- LOG_METHOD_AUTO;
+ LEVEL2( LOG_METHOD_AUTO );
LOG_FORMAT( "Category: %d, Key: %d", aCategory, aKey );
if ( aCategory == KPSUidMMFAudioServer )
{
@@ -349,24 +262,10 @@
// an error
// ---------------------------------------------------------------------------
//
-void CRadioSystemEventDetector::HandlePropertyChangeErrorL( const TUid& aCategory,
- const TUint aKey,
- TInt aError )
+void CRadioSystemEventDetector::HandlePropertyChangeErrorL( const TUid& /*aCategory*/,
+ const TUint /*aKey*/,
+ TInt /*aError*/ )
{
-#ifdef COMPILE_IN_IVALO
- if ( aCategory == KPSUidVoiceUiAccMonitor && aKey == KVoiceUiOpenKey && aError == KErrNotFound )
- {
- HandlePropertyChangeL( KPSUidVoiceUiAccMonitor, KVoiceUiOpenKey, KVoiceUiIsClose );
- }
- else
- {
- iObserver.ErrorCallbackL( aError );
- }
-#else
- (void)aCategory;
- (void)aKey;
- (void)aError;
-#endif //COMPILE_IN_IVALO
}
// ---------------------------------------------------------------------------
@@ -375,6 +274,7 @@
//
TBool CRadioSystemEventDetector::IsMobileNetworkCoverage() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iIsMobileNetworkCoverage;
}
@@ -384,7 +284,8 @@
//
TBool CRadioSystemEventDetector::IsNetworkCoverage() const
{
- return iIsWlanCoverage || iIsMobileNetworkCoverage;
+ LEVEL3( LOG_METHOD_AUTO );
+ return iIsMobileNetworkCoverage;
}
// ---------------------------------------------------------------------------
@@ -393,6 +294,7 @@
//
TBool CRadioSystemEventDetector::IsCallActive() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iIsCallActive;
}
@@ -402,41 +304,6 @@
//
TBool CRadioSystemEventDetector::IsAudioResourcesAvailable() const
{
+ LEVEL3( LOG_METHOD_AUTO );
return iIsAudioResourcesAvailable;
}
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CRadioSystemEventDetector::IsVoiceUiActive() const
- {
- return iIsVoiceUiActive;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioSystemEventDetector::SetNetworkCoverageL( const TBool aIsMobileNetworkCoverage,
- const TBool aIsWlanCoverage )
- {
- LOG_FORMAT( "CRadioSystemEventDetector::SetNetworkCoverageL ( mobile = %d wlan = %d )", aIsMobileNetworkCoverage, aIsWlanCoverage );
-
- TBool wasCoverage = IsNetworkCoverage();
- iIsMobileNetworkCoverage = aIsMobileNetworkCoverage;
- iIsWlanCoverage = aIsWlanCoverage;
- TBool isCoverage = IsNetworkCoverage();
-
- if ( isCoverage != wasCoverage )
- {
- if ( isCoverage )
- {
- iObserver.NetworkUpCallbackL();
- }
- else
- {
- iObserver.NetworkDownCallbackL();
- }
- }
- }
--- a/radioengine/utils/src/radioengineutils.cpp Fri Jun 04 10:21:36 2010 +0100
+++ b/radioengine/utils/src/radioengineutils.cpp Fri Jun 11 13:38:32 2010 +0300
@@ -27,9 +27,9 @@
//
// ---------------------------------------------------------------------------
//
-EXPORT_C void RadioEngineUtils::InitializeL( CCoeEnv* aCoeEnv )
+EXPORT_C void RadioEngineUtils::InitializeL()
{
- CRadioEngineTls::InitializeL( aCoeEnv );
+ CRadioEngineTls::InitializeL();
CRadioEngineTls::Instance().AddRef();
}
@@ -52,15 +52,6 @@
}
// ---------------------------------------------------------------------------
-// Return the cone environment
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CCoeEnv* RadioEngineUtils::Env()
- {
- return CRadioEngineTls::Instance().Env();
- }
-
-// ---------------------------------------------------------------------------
// Returns the file server session
// ---------------------------------------------------------------------------
//
--- a/rom/fmradio.iby Fri Jun 04 10:21:36 2010 +0100
+++ b/rom/fmradio.iby Fri Jun 11 13:38:32 2010 +0300
@@ -23,23 +23,24 @@
// Use standard macros
#include <data_caging_paths_for_iby.hrh>
-S60_APP_EXE(qtfmradio)
-data=ZPRIVATE\10003a3f\import\apps\qtfmradio_reg.rsc private\10003a3f\import\apps\qtfmradio_reg.rsc
+S60_APP_EXE(fmradio)
+data=ZRESOURCE\apps\fmradio.mif APP_RESOURCE_DIR\fmradio.mif
+data=ZPRIVATE\10003a3f\import\apps\fmradio_reg.rsc private\10003a3f\import\apps\fmradio_reg.rsc
-file=ABI_DIR\BUILD_DIR\radioenginewrapper.dll SHARED_LIB_DIR\radioenginewrapper.dll PAGED
-file=ABI_DIR\BUILD_DIR\radiopresetstorage.dll SHARED_LIB_DIR\radiopresetstorage.dll PAGED
-file=ABI_DIR\BUILD_DIR\radiouiengine.dll SHARED_LIB_DIR\radiouiengine.dll PAGED
-file=ABI_DIR\BUILD_DIR\radiowidgets.dll SHARED_LIB_DIR\radiowidgets.dll PAGED
-file=ABI_DIR\BUILD_DIR\radiowidgetsplugin.dll SHARED_LIB_DIR\radiowidgetsplugin.dll PAGED
-data=\epoc32\data\z\resource\plugins\radiowidgetsplugin.qtplugin resource\plugins\radiowidgetsplugin.qtplugin
+file=ABI_DIR\BUILD_DIR\fmradioenginewrapper.dll SHARED_LIB_DIR\fmradioenginewrapper.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradiopresetstorage.dll SHARED_LIB_DIR\fmradiopresetstorage.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradiouiengine.dll SHARED_LIB_DIR\fmradiouiengine.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradiowidgets.dll SHARED_LIB_DIR\fmradiowidgets.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradiowidgetsplugin.dll SHARED_LIB_DIR\fmradiowidgetsplugin.dll PAGED
+data=\epoc32\data\z\resource\plugins\fmradiowidgetsplugin.qtplugin resource\plugins\fmradiowidgetsplugin.qtplugin
-file=ABI_DIR\BUILD_DIR\radioengine.dll SHARED_LIB_DIR\radioengine.dll PAGED
-file=ABI_DIR\BUILD_DIR\radioengineutils.dll SHARED_LIB_DIR\radioengineutils.dll PAGED
-file=ABI_DIR\BUILD_DIR\radioenginesettings.dll SHARED_LIB_DIR\radioenginesettings.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradioengine.dll SHARED_LIB_DIR\fmradioengine.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradioengineutils.dll SHARED_LIB_DIR\fmradioengineutils.dll PAGED
+file=ABI_DIR\BUILD_DIR\fmradioenginesettings.dll SHARED_LIB_DIR\fmradioenginesettings.dll PAGED
-data=ZPRIVATE\10202be9\101FF976.txt private\10202be9\101FF976.txt
-data=\epoc32\data\z\resource\radioenginesettings.rsc \resource\radioenginesettings.rsc
+data=ZPRIVATE\10202be9\2002FF52.txt private\10202be9\2002FF52.txt
+data=\epoc32\data\z\resource\fmradioenginesettings.rsc \resource\fmradioenginesettings.rsc
-data=\epoc32\data\z\system\install\qtfmradio_stub.sis system\install\qtfmradio_stub.sis
+data=\epoc32\data\z\system\install\fmradio_stub.sis system\install\fmradio_stub.sis
#endif
--- a/rom/fmradio_resources.iby Fri Jun 04 10:21:36 2010 +0100
+++ b/rom/fmradio_resources.iby Fri Jun 11 13:38:32 2010 +0300
@@ -23,7 +23,7 @@
// Use standard macros
#include <data_caging_paths_for_iby.hrh>
-S60_APP_RESOURCE(qtfmradio)
+S60_APP_RESOURCE(fmradio)
data=DATAZ_\QT_TRANSLATIONS_DIR\fmradio.qm QT_TRANSLATIONS_DIR\fmradio.qm
--- a/rom/qtfmradio_stub.pkg Fri Jun 04 10:21:36 2010 +0100
+++ b/rom/qtfmradio_stub.pkg Fri Jun 11 13:38:32 2010 +0300
@@ -18,7 +18,7 @@
&EN
; Header
-#{"fmradio"}, (0xE6fe9aac), 1, 0, 0, TYPE=SA
+#{"fmradio"}, (0x2002FF53), 1, 0, 0, TYPE=SA
; Localised Vendor name
%{"Nokia"}
