The diff below, refering to DEVICE_UID_6630, is good to
check in.

--greg.



Edgar Luevano wrote:
Hi Greg,
I think I made a mistake in attach a different file.
The change is very simple and is only what it was written in the email body,

Sorry about that.
Edgar

this is the change.
Index: device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp
===================================================================
RCS file:

/cvsroot/audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp,v
retrieving revision 1.11
diff -u -r1.11 audio_session-mmf.cpp
--- device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp  29 Sep 2005
18:17:50 -0000  1.11
+++ device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp  3 Nov 2005
19:26:30 -0000
@@ -232,12 +232,13 @@
     // reset after a pause. Other devices (OMAP-based in particular) may
     // need to be added here.
     const TInt DEVICE_UID_6630 = 0x101fbb55; // emulator = 0x10005f62
+       const TInt DEVICE_UID_6680 = 0x10200f99;

     TInt uid = 0;
     TInt res = HAL::Get(HALData::EMachineUid, uid);
     if (KErrNone == res)
     {
-        if (DEVICE_UID_6630 == uid)
+        if (DEVICE_UID_6630 == uid || DEVICE_UID_6680 == uid )
         {
             m_deviceResetsOnPause = TRUE;
         }
















-----Original Message-----
From: Greg Wright [mailto:[EMAIL PROTECTED]
Sent: Friday, November 04, 2005 4:54 PM
To: Edgar Luevano
Cc: audio-dev; clientapps
Subject: Re: [Clientapps-dev] [audio-dev] CR-resend: Run-time check for
6680 device


Edgar Luevano wrote:
-----Original Message-----
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] Behalf Of Edgar Luevano
Sent: Thursday, November 03, 2005 4:22 PM
To: audio-dev
Subject: [audio-dev] CR: Run-time check for 6680 device


Modified by:[EMAIL PROTECTED]
Reviewed by:
Date:11/3/2005
Project:audio
Synopsis: Do run-time check for 6680 device.

Overview:
Do run-time check for 6680 device. that works similary than 6630. That is
it needs to reset the device after a pause (i.e m_samplesWritten = 0.

Index: device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp
===================================================================
RCS file:

/cvsroot/audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp,v
retrieving revision 1.11
diff -u -r1.11 audio_session-mmf.cpp
--- device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp  29 Sep 2005
18:17:50 -0000  1.11
+++ device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp  3 Nov 2005
19:26:30 -0000
@@ -232,12 +232,13 @@
     // reset after a pause. Other devices (OMAP-based in particular) may
     // need to be added here.
     const TInt DEVICE_UID_6630 = 0x101fbb55; // emulator = 0x10005f62
+       const TInt DEVICE_UID_6680 = 0x10200f99;

     TInt uid = 0;
     TInt res = HAL::Get(HALData::EMachineUid, uid);
     if (KErrNone == res)
     {
-        if (DEVICE_UID_6630 == uid)
+        if (DEVICE_UID_6630 == uid || DEVICE_UID_6680 == uid )
         {
             m_deviceResetsOnPause = TRUE;
         }



Index: device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp
===================================================================
RCS file:
/cvsroot/audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 audio_session-mmf.cpp
--- device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp  28 Jan 2005
23:37:35 -0000  1.1.2.3
+++ device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp  18 Feb 2005
16:20:43 -0000
@@ -161,6 +161,7 @@
  const char * StringifyKErr(TInt err) { return 0; }
  #endif

+#ifdef FLAG_TO_NUMBER   //define FLAG2NUMBER if FlagToNumber functions is
going to be used
  static TInt FlagToNumber(TMMFSampleRate flag)
  {
      switch( flag )
@@ -185,6 +186,7 @@
      HX_ASSERT(false);
      return 0;
  }
+#endif

  static TMMFSampleRate NumberToFlag(TInt num)
  {



What is this new FLAG_TO_NUMBER  (is it new?) and where is it defined
and how?


--greg.


Files Modified:

[audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp]

Image Size and Heap Use impact: None
Platforms and Profiles Affected:
symbian-80-thumb,helix-client-s60-advanced
Distribution Libraries Affected: None
Distribution library impact and planned action: None
Platforms and Profiles Build Verified:
symbian-80-thumb,helix-client-s60-advanced
Platforms and Profiles Functionality verified:
symbian-80-thumb,helix-client-s60-advanced
Branch: helix_restricted


Copyright assignment:
I agree to assign to RealNetworks full copyright ownership of the code
represented by the attached patch. I warrant that I am legally entitled to
grant the copyright assignment and that my contribution does not violate
any
law or breach any contract. I understand that RealNetworks may license
this
code under RPSL, RCSL, and/or any other license at RealNetworks' sole
discretion.



------------------------------------------------------------------------

_______________________________________________
Clientapps-dev mailing list
[EMAIL PROTECTED]
http://lists.helixcommunity.org/mailman/listinfo/clientapps-dev



_______________________________________________
Audio-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/audio-dev

Reply via email to