Changeset 4908:1268f8d7b740 in roaraudio

Timestamp:

05/07/11 16:37:01 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

upgraded to VS

File:

• roarfish/play.c (modified) (5 diffs)

roarfish/play.c

@@ -27 +27 @@
 
 struct roarfish_play_inst {
- int roarfh;
- int begun;
+ roar_vs_t * vss;
+ int _roarfh;
+ int _begun;
  FishSoundInfo fsinfo;
  FishSound * fsound;
@@ -37 +38 @@
  int16_t * data;
  int i;
- double s;
+ float s;
 
- if (!inst->begun) {
+ if (inst->vss == NULL) {
    fish_sound_command (fsound, FISH_SOUND_GET_INFO, &(inst->fsinfo),
                        sizeof (FishSoundInfo));
-   if ( (inst->roarfh = roar_simple_play(inst->fsinfo.samplerate, inst->fsinfo.channels,
-                                         16, ROAR_CODEC_NATIVE, NULL, "roarfish")) == -1 ) {
+
+   if ( (inst->vss = roar_vs_new_playback(NULL, "roarfish", inst->fsinfo.samplerate, inst->fsinfo.channels,
+                                          ROAR_CODEC_DEFAULT, 16, NULL)) == NULL ) {
     return -1;
    }
-   inst->begun = 1;
  }
 
- if ( (data = malloc(frames*2*inst->fsinfo.channels)) == NULL ) {
+ if ( (data = roar_mm_malloc(frames*2*inst->fsinfo.channels)) == NULL ) {
   return -1;
  }
@@ -57 +58 @@
  for (i = 0; i < frames; i++) {
   s  = ((float*)pcm)[i];
-  s *= 32767;
+  s *= 32767.f;
   data[i] = s;
  }
 
 
- write(inst->roarfh, (char*)data, frames * 2);
+ roar_vs_write(inst->vss, (char*)data, frames * 2, NULL);
 
 
- free(data);
+ roar_mm_free(data);
 
  return 0;
@@ -83 +84 @@
  struct roarfish_play_inst inst;
 
- inst.roarfh = -1;
- inst.begun  = 0;
+ inst.vss    = NULL;
 
  inst.fsound = fish_sound_new(FISH_SOUND_DECODE, &inst.fsinfo);
@@ -105 +105 @@
  fish_sound_delete(inst.fsound);
 
- return -1;
+ if ( inst.vss != NULL )
+  roar_vs_close(inst.vss, ROAR_VS_FALSE, NULL);
+
+ return 0;
 }