Changeset 3580:fcf489c8762c in roaraudio

Timestamp:

02/27/10 21:47:08 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use volume, use MAX/4 as default volume for beeps

Files:

• include/libroar/beep.h (modified) (1 diff)
• roard/beep.c (modified) (2 diffs)

include/libroar/beep.h

@@ -42 +42 @@
 #define ROAR_BEEP_MAX_POS 32767
 
+#define ROAR_BEEP_DEFAULT_VOL (ROAR_BEEP_MAX_VOL/4)
+
 #define ROAR_BEEP_TYPE_DEFAULT            0
 #define ROAR_BEEP_TYPE_CBELL              1

roard/beep.c

@@ -97 +97 @@
  struct roar_buffer        * buf;
  int stream;
+ int i;
 
  ROAR_DBG("beep_start(client=%i, beep=%p) = ?", client, beep);
 
  if ( beep->vol  == 0 )
-  beep->vol  = ROAR_BEEP_MAX_VOL;
+  beep->vol  = ROAR_BEEP_DEFAULT_VOL;
 
  if ( beep->time == 0 )
@@ -153 +154 @@
  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;
+ }
+
  if ( streams_set_dir(stream, ROAR_DIR_PLAY, 1) == -1 ) {
   streams_delete(stream);