diff -r 71c436fe3ce0 -r 4376525cdefb javauis/amms_akn/mmacontrol/inc/cammsaudiooutputcontrol.h
--- a/javauis/amms_akn/mmacontrol/inc/cammsaudiooutputcontrol.h	Wed Jun 09 09:34:07 2010 +0300
+++ b/javauis/amms_akn/mmacontrol/inc/cammsaudiooutputcontrol.h	Mon Jun 21 15:32:50 2010 +0300
@@ -30,7 +30,7 @@
 #include <AccMonitorInfo.h>
 
 
-
+class CMMAVolumeControl;
 
 // CONSTANTS
 _LIT(KAMMSAudioOutputControl, "AudioOutputControl");
@@ -45,7 +45,8 @@
 *  @since X.X
 */
 NONSHARABLE_CLASS(CAMMSAudioOutputControl)
-        : public CAMMSControl, public MMMAPlayerStateListener ,public MAudioOutputObserver,public MAccMonitorObserver
+        : public CAMMSControl, public MMMAPlayerStateListener ,
+          public MAccMonitorObserver
 {
 public:
     // Constructors and destructor
@@ -124,7 +125,7 @@
 
 public:
     // From MAudioOutputObserver
-    void DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,  CAudioOutput::TAudioOutputPreference aNewDefault);
+
     void DisconnectedL(CAccMonitorInfo *aAccessoryInfo);
     void ConnectedL(CAccMonitorInfo* aAccessoryInfo);
     void AccMonitorObserverError(TInt aError);
@@ -152,6 +153,8 @@
     */
     void ConstructL();
 
+    CMMAVolumeControl* GetVolumeControl();
+
 private:
     //Data
     // Preference visible in AMMS.
@@ -162,12 +165,13 @@
     TInt iCurrentPreference;
     // owned
     CAudioOutput* iAudioOutput;
-    CMMAPlayer::TPlayerState playerState;
-    //To get the peripheral attached/detached notification
-    CAccMonitorInfo* iAccessoryInfo;
-    RAccMonCapabilityArray capabilityArray;
+    CMMAPlayer::TPlayerState iPlayerState;
+    // Reference to volume control to set the current audio o/p preference.
+    // Not owning
+    CMMAVolumeControl* iVolumeControl;
+    // Owning
     CAccMonitor *iAccMonitor;
-    RConnectedAccessories array;
+    RConnectedAccessories iArray;
     jobject iJavaAudioOutputObj;
     JNIEnv* iJni;