--- a/radioapp/radioenginewrapper/inc/radioenginewrapper.h	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper.h	Mon May 03 12:31:41 2010 +0300
@@ -41,9 +41,12 @@
     /**
      * Constructor and destructor
      */
-    RadioEngineWrapper( RadioStationHandlerIf& stationHandler, RadioEngineWrapperObserver& observer );
+    RadioEngineWrapper( RadioStationHandlerIf& stationHandler );
     ~RadioEngineWrapper();
 
+    void addObserver( RadioEngineWrapperObserver* observer );
+    void removeObserver( RadioEngineWrapperObserver* observer );
+
     /**
      * Checks if the radio engine has been constructed properly
      */
@@ -67,28 +70,26 @@
      * Getters for current radio status
      */
     bool isRadioOn() const;
-    bool isScanning() const;
     uint currentFrequency() const;
     bool isMuted() const;
     bool isAntennaAttached() const;
     bool isUsingLoudspeaker() const;
 
     /**
-     * Slots to tune to given frequency or preset
+     * Functions to tune to given frequency or preset
      */
-    void tuneFrequency( uint frequency, const int sender = CommandSender::Unspecified );
-    void tuneWithDelay( uint frequency, const int sender = CommandSender::Unspecified );
+    void tuneFrequency( uint frequency, const int reason = TuneReason::Unspecified );
+    void tuneWithDelay( uint frequency, const int reason = TuneReason::Unspecified );
 
     /*!
-     * volume update command slot for the engine
+     * Audio update command functions for the engine
      */
     void setVolume( int volume );
     void toggleMute();
     void toggleAudioRoute();
 
-    void startSeeking( Seeking::Direction direction );
-    void scanFrequencyBand();
-    void cancelScanFrequencyBand();
+    void startSeeking( Seeking::Direction direction, const int reason = TuneReason::Unspecified );
+    void cancelSeeking();
 
 private: // data