UIQ3 update, some makefile unification, rm old configs, stuff

[picodrive.git] / platform / uiq3 / engine / audio_mediaserver.h

diff --git a/platform/uiq3/engine/audio_mediaserver.h b/platform/uiq3/engine/audio_mediaserver.h
index 25d1027..fc94f7c 100644 (file)
--- a/platform/uiq3/engine/audio_mediaserver.h
+++ b/platform/uiq3/engine/audio_mediaserver.h
@@ -15,11 +15,11 @@
 #ifndef __AUDIO_MEDIASERVER_H\r
 #define __AUDIO_MEDIASERVER_H\r
 \r
-#include <Mda\Common\Audio.h>\r
-#include <MdaAudioOutputStream.h>\r
+#include <mda/common/audio.h>\r
+#include <mdaaudiooutputstream.h>\r
 \r
 //#include "audio.h"\r
-#include "polledas.h"\r
+#include "PolledAS.h"\r
 \r
 const TInt KSoundBuffers = 4;\r
 \r
@@ -44,12 +44,12 @@ public:     // implements IGameAudio
        TInt16 *NextFrameL(TInt aPcmFrames);\r
        TInt16 *ResumeL();\r
        void Pause();\r
-       void ChangeVolume(TInt aUp);\r
+       TInt ChangeVolume(TInt aUp);\r
 \r
 public:\r
        ~CGameAudioMS();\r
-       CGameAudioMS(TInt aRate, TBool aStereo, TInt aWritesPerSec);\r
-       static CGameAudioMS* NewL(TInt aRate, TBool aStereo, TInt aWritesPerSec);\r
+       CGameAudioMS(TInt aRate, TBool aStereo, TInt aWritesPerSec, TInt aVolume);\r
+       static CGameAudioMS* NewL(TInt aRate, TBool aStereo, TInt aWritesPerSec, TInt aVolume);\r
 \r
 protected:\r
        void WriteBlockL();\r
@@ -70,12 +70,12 @@ protected:
        CPolledActiveScheduler  *iScheduler;\r
 \r
        HBufC8*                                 iSoundBuffers[KSoundBuffers];\r
-       TInt                                    iWritesPerSec;\r
-       TInt                                    iBufferedFrames;\r
+       TInt                                    iWritesPerSec;                  // fps, may be more actual writes\r
+       TInt                                    iMaxWriteSamples;               // max samples per write\r
        TInt16*                                 iCurrentPosition;\r
-       TInt                                    iCurrentBuffer;\r
-       TInt                                    iCurrentBufferSize;\r
-       TInt                                    iFrameCount;\r
+       TInt                                    iCurrentBuffer;                 // active buffer\r
+       TInt                                    iCurrentBufferSize;             // bytes filled in buffer\r
+       TInt                                    iBufferSize;\r
        CMdaServer*                             iServer;\r
 \r
        TInt64                                  iTime;\r