WebSVN – Kolibri OS – Diff – /programs/media/ac97snd/trunk/ac97wav.c

 //   but WITHOUT ANY WARRANTY; without even the implied warranty of
 //   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //   GNU General Public License for more details.
-#include "kolibri.h"
-//#include "stdio.h"
+#include "kolibri.h"
 #include "string.h"
 #include "ac97wav.h"
+#include "mpg/mpg123.h"
-#include "mpg/mpg123.h"
+#include "sound.h"
-#define MP3_ERROR_OUT_OF_BUFFER                 5
+#define MP3_ERROR_OUT_OF_BUFFER  5
 int mp3FindSync(byte* buf, int size, int* sync);
 int stream_read_raw(struct reader *rd,unsigned char *buf, int size);
-char *fname;
-//extern char __path;
-/*****      for debug output only
-char formats[37][12] =
-{ "PCM_ALL",
-  "PCM_2_16_48","PCM_1_16_48","PCM_2_16_44","PCM_1_16_44",
-  "PCM_2_16_32","PCM_1_16_32","PCM_2_16_24","PCM_1_16_24",
-  "PCM_2_16_22","PCM_1_16_22","PCM_2_16_16","PCM_1_16_16",
-  "PCM_2_16_12","PCM_1_16_12","PCM_2_16_11","PCM_1_16_11",
-  "PCM_2_16_8","PCM_1_16_8","PCM_2_8_48","PCM_1_8_48",
-  "PCM_2_8_44","PCM_1_8_44","PCM_2_8_32","PCM_1_8_32",
-  "PCM_2_8_24","PCM_1_8_24","PCM_2_8_22","PCM_1_8_22",
-  "PCM_2_8_16","PCM_1_8_16","PCM_2_8_12","PCM_1_8_12",
-  "PCM_2_8_11","PCM_1_8_11","PCM_2_8_8","PCM_1_8_8"
-};
-*******/
-//int freqs[9] = {44100,48000,32000,22050,24000,16000 ,11025 ,12000 ,8000};
+char *fname;
 struct reader rd;
 struct frame fr;
-DWORD hDrv;
-DWORD hSound;
+DWORD hDrv;
-DWORD hBuff;
+DWORD hSound;
-DWORD event[2];
+SNDBUF hBuff;
+CTRL_INFO info;
+FILEINFO   fileinfo;
-CTRL_INFO info;
+int m_vol;
 int l_vol=-500;
-FILEINFO   fileinfo;
+int r_vol=-500;
 int outsize;
 int outremain;
 int totalout;
 int done;
-char srv_name[] = "INFINITY";
 char srv_intel[] = "SOUND";
 char header[] = "AC97 MP3 player";
 char buttons_text[]=" Play    Stop     <<      >>     Vol-    Vol+";
    EndDraw();
 };
 void draw_progress_bar()
 {  DWORD x;
-   x = 286.0f * (float)(rd.filepos-rd.strremain)/(float)fileinfo.size;
+   x = 287.0f * (float)(rd.filepos-rd.strremain)/(float)fileinfo.size;
    if(x==0) return;
    draw_bar(7,41,x,11,0xA0A0A0);
-   draw_bar(x+7,41,286-x,11,0x404040);
+   draw_bar(x+7,41,287-x,11,0x404040);
 };
 void debug_out_str(char* str)
 int main(int argc, char *argv[])      //int argc, char *argv[])
 { DWORD fmt;
    char *thread_stack;
    DWORD r_bytes;
    int retval;
+   int err;
+   int ver;
    fname = argv[1];
    //debug_out_str(fname);
    InitHeap(1024*1024);
-   if(get_fileinfo(fname, &fileinfo)==FILE_NOT_FOUND)
-      return 0;
+   if(get_fileinfo(fname, &fileinfo)==FILE_NOT_FOUND)
+      return 0;
    if((hDrv=GetService(srv_intel))==0)
+   if(err = InitSound(&ver))
-      return 0;
+   {
+     debug_out_str("Sound service not installed\n\r");
-   if ((hSound=GetService(srv_name))==0)
+     return 0;
-     return 0;
+   }
-   GetDevInfo(hDrv, &info);
-   m_vol = GetMasterVol(hDrv,&m_vol);
+   if( ver != SOUND_VERSION)
    if (m_vol > 85)
-   { m_vol = 85;
+     debug_out_str("Sound service version mismatch\n\r");
-      SetMasterVol(hDrv,m_vol);
+     return 0;
-        fr.single = -1;
+     fr.single = -1;
    };
    status = ST_PLAY;
+   if (err = CreateBuffer(fmt,0, &hBuff))
+   {
+     debug_out_str("create buffer return error\n\r");
+     return 0;
+   }
    hBuff = CreateBuffer(hSound,fmt);
-   if (hBuff == 0) return 0;
+   SetVolume(hBuff,l_vol,r_vol);
    thread_stack = UserAlloc(4096);
       {  case ST_PLAY:
            snd_play();
            continue;
          case ST_STOP:
-           StopBuffer(hSound, hBuff);
+           StopBuffer(hBuff);
            status = ST_DONE;
            continue;
          case ST_EXIT:
-           StopBuffer(hSound, hBuff);
+           StopBuffer(hBuff);
-           DestroyBuffer(hSound, hBuff);
+           DestroyBuffer(hBuff);
            return 0;
       };
    };
     whdr.wBitsPerSample = 16;
     return test_wav(&whdr);
-};
-void wave_out(char* buff)
-{ DWORD ev[6];
-   GetNotify(&ev[0]);
-   SetBuffer(hSound,hBuff,buff,ev[1],0x8000);
+};
 void play_mp3()
     totalout=0;
     done = 0;
     outremain=0x40000;
-    memset(outbuf,0,0x40000);
     memset(outbuf,0,0x40000);
-    set_reader(&rd, 0);    //;first_sync);
-    SetBuffer(hSound,hBuff,outbuf,0,0x8000);
-    SetBuffer(hSound,hBuff,outbuf,0x8000,0x8000);
-    PlayBuffer(hSound, hBuff);
+    set_reader(&rd, 0);    //;first_sync);
     while(1)
           if(outremain < outcount*2)
             break;
     };
     if(done)
-    { if(totalout < 32768)
+    { if(totalout < 4096)
-            {  memset(outPtr,0,32768-totalout);
+      {  memset(outPtr,0,4096-totalout);
-                totalout = 32768;
+                totalout = 4096;
       };
+    }
-    };
+    else
-    if(totalout < 32768)
+      if(totalout < 8192)
-      continue;
+        continue;
 /*
      _asm
   {  push edx
       pop eax
       pop edx
   };
 */
     outPtr = outbuf;
-    while (totalout > 32768)
+    while (totalout >= 4096)
+    {
-    { wave_out(outPtr);
+      WaveOut(hBuff,outPtr,4096);
+      if(status!=ST_PLAY)
+      { if(status != ST_EXIT)
+         status =  ST_STOP;
+        return;
+      };
-             totalout-=0x8000;
+      totalout-=4096;
-             outPtr+=0x8000;
+      outPtr+=4096;
-             outremain+=0x8000;
+      outremain+=4096;
     };
-    if(done) break;
+    if(done)
+      break;
     memmove(outbuf,outPtr, totalout);
     outPtr = outbuf+totalout;
+   }
     if(status != ST_EXIT)
     status =  ST_STOP;
 };
-void play_wave()
-{ DWORD ev[6];
-   int retval;
-   int remain;
-   int i;
-//   offset = 44;
 void play_wave()
-//   read_file (fname,outbuf,offset,32*1024,0);
-//   offset+=32*1024;
-   set_reader(&rd,44);
-   stream_read_raw(&rd,outbuf,32768);
-   SetBuffer(hSound,hBuff,outbuf,0,0x8000);
-   stream_read_raw(&rd,outbuf,32768);
-   SetBuffer(hSound,hBuff,outbuf,0x8000,0x8000);
 {  int retval;
    PlayBuffer(hSound, hBuff);
    set_reader(&rd,44);
    retval = 0;
    while(1)
+   {
       if(status!=ST_PLAY)
         break;
       if( !stream_read_raw(&rd,outbuf,32768))
       {  done = 1;
           break;
       };
-      wave_out(outbuf);
+      WaveOut(hBuff,outbuf,32768);
    };
    if(status != ST_EXIT)
     status =  ST_STOP;
 };
 void snd_stop()
+{
+  StopBuffer(hBuff);
+};
-  StopBuffer(hSound, hBuff);
+void thread_proc()
+{  int evnt;
+   int pos;
-};
+   int key;
-void thread_proc()
+  _asm
 {  int evnt;
-   int pos;
+    mov eax, 66
-   int key;
+    mov ebx, 1
-  _asm { fninit };
+    mov ecx, 1
     int 0x40
   };
   draw_window();
       case EV_REDRAW:
         draw_window();
         break;
       case EV_KEY:
+        if(!get_key(&key))
+        {
-        key = get_key();
+          switch(key)
+          {  case 0xE0:
+             case 0xE1:
+               break;
+             default:
+               switch (key)
+               {
-        if(key==27)
+                 case 0x01:  //Esc
-        {   status = ST_EXIT;
+                   status = ST_EXIT;
-            exit();
-        };
-        if((key==45)||key==54)
-        { if(m_vol > 0)
-          { m_vol--;
-            SetMasterVol(hDrv,m_vol);
-          };
+                   exit();
+                   break;
+                 case 0x47:  //Home
+                   if(l_vol < 0)
+                   { l_vol+=100;
+                     r_vol+=100;
+                     SetVolume(hBuff,l_vol,r_vol);
+                   };
+                   break;
+                 case 0x4F:  //End
+                   if(l_vol > -10000)
+                   { l_vol-=100;
+                     r_vol-=100;
+                     SetVolume(hBuff,l_vol,r_vol);
+                   };
+                   break;
+                 case 0x53:
+                   if(pan > -10000)
+                   { pan -=100;
+                     SetPan(hBuff,pan);
+                   };
+                   break;
+                 case 0x51:
+                   if(pan < 10000)
+                   { pan +=100;
-          break;
+                     SetPan(hBuff,pan);
-        };
-        if((key==61)||key==56)
+                   };
-        { if(m_vol < 90)
+                   break;
-          { m_vol++;
             SetMasterVol(hDrv,m_vol);
           };
         };
         break;
              status = ST_STOP;
              break;
 //           case 0x12:
 //           case 0x13:
            case 0x14:
-             if(m_vol > 0)
+            if(l_vol > -10000)
+            {
-             { m_vol--;
+              l_vol-=100;
+              r_vol-=100;
-               SetMasterVol(hDrv,m_vol);
+              SetVolume(hBuff,l_vol,r_vol);
-             };
+            };
-             break;
+            break;
            case 0x15:
+            if(l_vol < 0)
-             if(m_vol < 90)
+            { l_vol+=100;
-             { m_vol++;
+              r_vol+=100;
-               SetMasterVol(hDrv,m_vol);
+              SetVolume(hBuff,l_vol,r_vol);
-             };
+            };
-             break;
+            break;
            case 0x30:
-            if(status==ST_DONE)
-              break;
-//            if(snd_play == play_mp3)
+            if(status==ST_DONE)
-//              continue;
+              break;
             pos = (GetMousePos(REL_WINDOW)>>16)-7;
             offset = ((fileinfo.size-44)/286*pos+44)&0xFFFFFFFC;
             set_reader(&rd, offset);
             draw_progress_bar();
             break;
         };
     };
-  };
-};
-DWORD test_wav(WAVEHEADER *hdr)
-{
-  if(hdr->riff_id != 0x46464952)
-    return 0;
-  if(hdr->riff_format != 0x45564157)
-    return 0;
-  if (hdr->wFormatTag != 0x01)
-    return 0;
-  switch(hdr->nSamplesPerSec)
-  { case 48000:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_48;
-           else
-             return PCM_1_8_48;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_48;
-           else
-             return PCM_2_8_48;
-      };
-    case 44100:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_44;
-           else
-             return PCM_1_8_44;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_44;
-           else
-             return PCM_2_8_44;
-      };
-    case 32000:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_32;
-           else
-             return PCM_1_8_32;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_32;
-           else
-             return PCM_2_8_32;
-      };
-    case 24000:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_24;
-           else
-             return PCM_1_8_24;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_24;
-           else
-             return PCM_2_8_24;
-      };
-    case 22050:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_22;
-           else
-             return PCM_1_8_22;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_22;
-           else
-             return PCM_2_8_22;
-      };
-    case 16000:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_16;
-           else
-             return PCM_1_8_16;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_16;
-           else
-             return PCM_2_8_16;
-      };
-    case 12000:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_12;
-           else
-             return PCM_1_8_12;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_12;
-           else
-             return PCM_2_8_12;
-      };
-    case 11025:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_11;
-           else
-             return PCM_1_8_11;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_11;
-           else
-             return PCM_2_8_11;
-      };
-    case 8000:
-      switch (hdr->nChannels)
-      {  case 1:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_1_16_8;
-           else
-             return PCM_1_8_8;
-         case 2:
-           if(hdr->wBitsPerSample == 16)
-             return PCM_2_16_8;
-           else
-             return PCM_2_8_8;
-      };
-      default:
-        return 0;
   };
 };
 void delay (int val)
+{
  };
  return retval;
 };
-int wait_for_event_infinite()
-{   void *a;
+int wait_for_event_infinite()
-     int retval;
+{ int retval;
   _asm
   {  mov  eax,10
       int  0x40
       mov [retval], eax

Subversion Repositories Kolibri OS

(root)/programs/media/ac97snd/trunk/ac97wav.c – Rev 286 → 376