--- a/radioengine/engine/inc/cradioengineimp.h	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioengine/engine/inc/cradioengineimp.h	Thu Jul 22 16:33:45 2010 +0100
@@ -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