Changeset 3581:2f5833dfb334 in roaraudio for roard/beep.c

Timestamp:

02/27/10 22:05:38 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for X possition of events

File:

• roard/beep.c (modified) (3 diffs)

roard/beep.c

@@ -97 +97 @@
  struct roar_buffer        * buf;
  int stream;
- int i;
 
  ROAR_DBG("beep_start(client=%i, beep=%p) = ?", client, beep);
@@ -120 +119 @@
 
  if ( beep->y != 0 )
-  return -1;
-
- if ( beep->x != 0 )
   return -1;
 
@@ -151 +147 @@
  memcpy(&(s->info), g_sa, sizeof(s->info));
 
- s->info.channels = 1;
+ s->info.channels = 2;
  s->info.bits     = 8;
 
- for (i = 0; i < s->info.channels; i++) {
-  ss->mixer.mixer[i] = beep->vol;
-  ss->mixer.scale    = ROAR_BEEP_MAX_VOL;
- }
+ ss->mixer.mixer[0] = beep->x > 0 ?
+                        ((long)beep->vol * ((long)ROAR_BEEP_MAX_POS - (long)beep->x)/(long)ROAR_BEEP_MAX_POS) :
+                        beep->vol;
+ ss->mixer.mixer[1] = beep->x < 0 ?
+                        ((long)beep->vol * ((long)ROAR_BEEP_MAX_POS + (long)beep->x)/(long)ROAR_BEEP_MAX_POS) :
+                        beep->vol;
+ ss->mixer.scale    = ROAR_BEEP_MAX_VOL;
+
+ ROAR_DBG("beep_start(client=%i, beep=%p): beep->x=%i, ss->mixer.mixer[] = {%u, %u}", client, beep, beep->x, ss->mixer.mixer[0], ss->mixer.mixer[1]);
 
  if ( streams_set_dir(stream, ROAR_DIR_PLAY, 1) == -1 ) {