Changeset 609:093b3891d709 in roaraudio for roard/streams.c

Timestamp:

08/19/08 21:10:25 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cleanup of casts

File:

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

roard/streams.c

@@ -136 +136 @@
  ROAR_DBG("streams_set_fh(id=%i): g_streams[id]->id=%i", id, ROAR_STREAM(g_streams[id])->id);
 
- ((struct roar_stream *)g_streams[id])->fh = fh;
+ ROAR_STREAM(g_streams[id])->fh = fh;
 
  if ( codecfilter_open(&(g_streams[id]->codecfilter_inst), &(g_streams[id]->codecfilter), NULL,
@@ -163 +163 @@
   return -1;
 
- return ((struct roar_stream *)g_streams[id])->fh;
+ return ROAR_STREAM(g_streams[id])->fh;
 }
 
@@ -408 +408 @@
 */
 
- ((struct roar_stream*)g_streams[id])->pos =
-      ROAR_MATH_OVERFLOW_ADD(((struct roar_stream*)g_streams[id])->pos,
+ ROAR_STREAM(g_streams[id])->pos =
+      ROAR_MATH_OVERFLOW_ADD(ROAR_STREAM(g_streams[id])->pos,
           ROAR_OUTPUT_CALC_OUTBUFSAMP(info, needed-todo));
  //ROAR_WARN("stream=%i, pos=%u", id, ((struct roar_stream*)g_streams[id])->pos);
@@ -441 +441 @@
  for (i = 0; i < ROAR_STREAMS_MAX; i++) {
   if ( g_streams[i] != NULL ) {
-   if ( ((struct roar_stream *)g_streams[i])->dir != ROAR_DIR_PLAY )
+   if ( ROAR_STREAM(g_streams[i])->dir != ROAR_DIR_PLAY )
     continue;
 
@@ -538 +538 @@
  ROAR_DBG("streams_check(id=%i) = ?", id);
 
- s = (struct roar_stream *) (ss = g_streams[id]);
+ s = ROAR_STREAM(ss = g_streams[id]);
 
  if ( (fh = s->fh) == -1 )
@@ -675 +675 @@
  ROAR_DBG("streams_send_filter(id=%i) = ?", id);
 
- s = (struct roar_stream *) (ss = g_streams[id]);
+ s = ROAR_STREAM(ss = g_streams[id]);
 
  if ( (fh = s->fh) == -1 )