Changeset 881:fdf97832f81f in roaraudio for roard/streams.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

redesigned the VIO abstarction layer a lot

File:

• roard/streams.c (modified) (6 diffs)

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);
 }