Changeset 3578:4480c38a3150 in roaraudio

Timestamp:

02/27/10 21:34:09 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

basic work of beep support

File:

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

roard/beep.c

@@ -26 +26 @@
 #include "roard.h"
 
+// TODO: FIXME: move them out of here into libroar:
+static ssize_t beep_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
+ ROAR_DBG("beep_read(vio=%p, buf=%p, count=%llu) = ?", vio, buf, (long long unsigned int)count);
+
+ if ( vio->inst == NULL )
+  return 0;
+
+ if ( roar_buffer_shift_out(&(vio->inst), buf, &count) == -1 )
+  return -1;
+
+ return count;
+}
+
+static int     beep_close   (struct roar_vio_calls * vio) {
+ ROAR_DBG("beep_close(vio=%p) = ?", vio);
+
+ if ( vio->inst != NULL )
+  roar_buffer_free(vio->inst);
+
+ ROAR_DBG("beep_close(vio=%p) = 0", vio);
+ return 0;
+}
+
+static void beep_init_vio (struct roar_vio_calls * vio, void * inst) {
+ ROAR_DBG("beep_init_vio(vio=%p, inst=%p) = ?", vio, inst);
+
+ memset(vio, 0, sizeof(struct roar_vio_calls));
+
+ vio->inst  = inst;
+ vio->read  = beep_read;
+ vio->close = beep_close;
+
+ ROAR_DBG("beep_init_vio(vio=%p, inst=%p) = (void)", vio, inst);
+}
+
+struct roar_buffer * beep_fill_buffer (struct roar_beep * beep, struct roar_audio_info * info) {
+ struct roar_buffer          * buf;
+ size_t frames  = beep->time * info->rate     / 1000;
+ size_t samples = frames     * info->channels;
+ size_t mod     = info->rate / beep->freq;
+ char                        * data;
+ char   val;
+ size_t pos;
+ size_t chan;
+
+ ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = ?", beep, info);
+
+ if ( roar_buffer_new(&buf, samples) == -1 )
+  return NULL;
+
+ if ( roar_buffer_get_data(buf, &data) == -1 ) {
+  roar_buffer_free(buf);
+  ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = NULL", beep, info);
+  return NULL;
+ }
+
+ for (pos = 0; pos < frames; pos++) {
+  val = (pos % mod) < mod/2 ? -128 : 127;
+  for (chan = 0; chan < info->channels; chan++)
+   data[pos*info->channels + chan] = val;
+ }
+
+ ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = %p", beep, info, buf);
+ return buf;
+}
+
 int beep_start (int client, struct roar_beep * beep) {
- struct roar_stream_server * ss;
- struct roar_stream        *  s;
+ struct roar_stream_server *  ss;
+ struct roar_stream        *   s;
+ struct roar_buffer        * buf;
  int stream;
+
+ ROAR_DBG("beep_start(client=%i, beep=%p) = ?", client, beep);
 
  if ( beep->vol  == 0 )
@@ -55 +124 @@
   return -1;
 
+ ROAR_DBG("beep_start(client=%i, beep=%p) = ?", client, beep);
+
  if ((stream = streams_new()) == -1 )
   return -1;
+
+ ROAR_DBG("beep_start(client=%i, beep=%p): stream=%i", client, beep, stream);
 
  if ( client_stream_add(client, stream) == -1 ) {
@@ -78 +151 @@
 
  s->info.channels = 1;
+ s->info.bits     = 8;
 
  if ( streams_set_dir(stream, ROAR_DIR_PLAY, 1) == -1 ) {
@@ -84 +158 @@
  }
 
+ if ( (buf = beep_fill_buffer(beep, &(s->info))) == NULL ) {
+  streams_delete(stream);
+  return -1;
+ }
+
+ ROAR_DBG("beep_start(client=%i, beep=%p): buf=%p", client, beep, buf);
+
+ beep_init_vio(&(ss->vio), buf);
+
+ if ( streams_set_fh(stream, -2) == -1 ) {
+  streams_delete(stream);
+  return -1;
+ }
+
+ ROAR_DBG("beep_start(client=%i, beep=%p) = %i", client, beep, stream);
  return stream;
 }