Changeset 881:fdf97832f81f in roaraudio

Timestamp:

11/16/08 00:31:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

redesigned the VIO abstarction layer a lot

Files:

• include/libroar/vio.h (modified) (1 diff)
• libroar/stream.c (modified) (1 diff)
• libroar/vio.c (modified) (1 diff)
• roard/streams.c (modified) (6 diffs)

include/libroar/vio.h

@@ -40 +40 @@
 struct roar_vio_calls {
  void * inst;
+/*
  ssize_t (*read) (int fd, void *buf, size_t count, void * inst);
  ssize_t (*write)(int fd, void *buf, size_t count, void * inst);
  off_t   (*lseek)(int fildes, off_t offset, int whence, void * inst);
+*/
+ssize_t (*read )(struct roar_vio_calls * vio, void *buf, size_t count);
+ssize_t (*write)(struct roar_vio_calls * vio, void *buf, size_t count);
+off_t   (*lseek)(struct roar_vio_calls * vio, off_t offset, int whence);
 };
 
 int roar_vio_init_calls (struct roar_vio_calls * calls);
 
+int roar_vio_set_inst (struct roar_vio_calls * vio, void * inst);
+int roar_vio_set_fh   (struct roar_vio_calls * vio, int fh);
+
+int roar_vio_get_fh   (struct roar_vio_calls * vio);
+
+ssize_t roar_vio_read (struct roar_vio_calls * vio, void *buf, size_t count);
+ssize_t roar_vio_write(struct roar_vio_calls * vio, void *buf, size_t count);
+off_t   roar_vio_lseek(struct roar_vio_calls * vio, off_t offset, int whence);
+
+
+// possible VIOs:
+
+// basic
+ssize_t roar_vio_basic_read (struct roar_vio_calls * vio, void *buf, size_t count);
+ssize_t roar_vio_basic_write(struct roar_vio_calls * vio, void *buf, size_t count);
+off_t   roar_vio_basic_lseek(struct roar_vio_calls * vio, off_t offset, int whence);
+
 #endif
 

libroar/stream.c

@@ -384 +384 @@
  {ROAR_CODEC_ROAR_SPEEX,  "roar_speex" },
 
+ // RAUM:
+ {ROAR_CODEC_RAUM,        "raum"       },
+ {ROAR_CODEC_RAUM_VORBIS, "raum_vorbis"},
+
  // RIFF/WAVE like:
  {ROAR_CODEC_RIFF_WAVE,   "riff_wave"  },

libroar/vio.c

@@ -41 +41 @@
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
 
+/*
  calls->read  = (ssize_t (*)(int fd, void *buf, size_t count,      void * inst))read;
  calls->write = (ssize_t (*)(int fd, void *buf, size_t count,      void * inst))write;
  calls->lseek = (off_t   (*)(int fildes, off_t offset, int whence, void * inst))lseek;
+*/
+
+ calls->read  = roar_vio_basic_read;
+ calls->write = roar_vio_basic_write;
+ calls->lseek = roar_vio_basic_lseek;
 
  return 0;
 }
 
+int roar_vio_set_inst (struct roar_vio_calls * vio, void * inst) {
+ if ( vio == NULL )
+  return -1;
+
+ vio->inst = inst;
+
+ return 0;
+}
+
+int roar_vio_set_fh   (struct roar_vio_calls * vio, int fh) {
+ return roar_vio_set_inst(vio, (void*)(fh + 1));
+}
+
+int roar_vio_get_fh   (struct roar_vio_calls * vio) {
+ if ( vio == NULL )
+  return -1;
+
+ return ((int)vio->inst) - 1;
+}
+
+
+ssize_t roar_vio_read (struct roar_vio_calls * vio, void *buf, size_t count) {
+ if ( vio == NULL )
+  return -1;
+
+ if ( vio->read == NULL )
+  return -1;
+
+ return vio->read(vio, buf, count);
+}
+
+ssize_t roar_vio_write(struct roar_vio_calls * vio, void *buf, size_t count) {
+ if ( vio == NULL )
+  return -1;
+
+ if ( vio->write == NULL )
+  return -1;
+
+ return vio->write(vio, buf, count);
+}
+
+off_t   roar_vio_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
+ if ( vio == NULL )
+  return -1;
+
+ if ( vio->lseek == NULL )
+  return -1;
+
+ return vio->lseek(vio, offset, whence);
+}
+
+
+ssize_t roar_vio_basic_read (struct roar_vio_calls * vio, void *buf, size_t count) {
+ return read(roar_vio_get_fh(vio), buf, count);
+}
+
+ssize_t roar_vio_basic_write(struct roar_vio_calls * vio, void *buf, size_t count) {
+ return write(roar_vio_get_fh(vio), buf, count);
+}
+
+off_t   roar_vio_basic_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
+ return lseek(roar_vio_get_fh(vio), offset, whence);
+}
+
 //ll

roard/streams.c

@@ -629 +629 @@
   done = 0;
   while (req > 0 && done != realreq) {
-   if ( (req = read(fh, buf+done, realreq-done)) > 0 )
+   if ( (req = stream_vio_s_read(ss, buf+done, realreq-done)) > 0 )
     done += req;
   }
@@ -714 +714 @@
 
  if ( ss->codecfilter == -1 ) {
-  if ( write(fh, obuf, olen) == olen ) {
+  if ( stream_vio_s_write(ss, obuf, olen) == olen ) {
    if ( need_to_free ) free(obuf);
    return 0;
@@ -736 +736 @@
   usleep(100); // 0.1ms
 
-  if ( write(fh, obuf, olen) == olen ) {
+  if ( stream_vio_s_write(ss, obuf, olen) == olen ) {
    if ( need_to_free ) free(obuf);
    return 0;
@@ -772 +772 @@
  ROAR_DBG("streams_send_filter(id=%i): fh = %i", id, fh);
 
- if ( write(fh, g_output_buffer, g_output_buffer_len) == g_output_buffer_len ) {
+ if ( stream_vio_s_write(ss, g_output_buffer, g_output_buffer_len) == g_output_buffer_len ) {
   while ( have < g_output_buffer_len ) {
-   if ( (len = read(fh, g_output_buffer+have, g_output_buffer_len-have)) < 1 ) {
+   if ( (len = stream_vio_s_read(ss, g_output_buffer+have, g_output_buffer_len-have)) < 1 ) {
     streams_delete(id);
     return -1;
@@ -821 +821 @@
   return -1;
 
+ roar_vio_set_fh(&(stream->vio), ROAR_STREAM(stream)->fh);
+
  if ( ! stream->vio.read )
   return -1;
 
- while ( (r = stream->vio.read(ROAR_STREAM(stream)->fh, buf, count, stream->vio.inst)) > 0 ) {
+ while ( (r = roar_vio_read(&(stream->vio), buf, count)) > 0 ) {
   len   += r;
   buf   += r;
@@ -844 +846 @@
   return -1;
 
- if ( ! stream->vio.write )
-  return -1;
-
- return stream->vio.write(ROAR_STREAM(stream)->fh, buf, count, stream->vio.inst);
+ roar_vio_set_fh(&(stream->vio), ROAR_STREAM(stream)->fh);
+
+ return roar_vio_write(&(stream->vio), buf, count);
 }