Changeset 1239:bfbca4801c7b in roaraudio

Timestamp:

02/26/09 03:12:56 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done the a bit cleanup

Location:

roard

Files:

• codecfilter_vorbis.c (modified) (2 diffs)
• streams.c (modified) (1 diff)

roard/codecfilter_vorbis.c

@@ -367 +367 @@
   vorbis_block_init(&(self->encoder.vd), &(self->encoder.vb));
 
-  ROAR_WARN("cf_vorbis_encode_start(*): srn=%i", self->encoder.srn);
+  ROAR_DBG("cf_vorbis_encode_start(*): srn=%i", self->encoder.srn);
                                      //  "RA"<<16 + PID<<8 + Stream ID
   ogg_stream_init(&(self->encoder.os),
-                   ((0x5241 + self->encoder.srn)<<16) +
-                   ((getpid() & 0xff           )<< 8) +
-                   ( sid      & 0xff               ));
+                   (((0x5241 + self->encoder.srn) & 0xffff)<<16) +
+                   ( (getpid()                    & 0x00ff)<< 8) +
+                   (  sid                         & 0x00ff));
  return 0;
 #else
@@ -431 +431 @@
  switch (cmd) {
   case ROAR_CODECFILTER_CTL2CMD(ROAR_CODECFILTER_CTL_META_UPDATE):
-    ROAR_WARN("stoping stream...");
+    ROAR_DBG("cf_vorbis_ctl(*): stoping stream...");
     if ( cf_vorbis_encode_end(self) == -1 )
      return -1;
-    ROAR_WARN("restarting stream...");
+    ROAR_DBG("cf_vorbis_ctl(*): restarting stream...");
     if ( cf_vorbis_encode_start(self) == -1 )
      return -1;

roard/streams.c

@@ -382 +382 @@
  cmd &= ~comp;
 
- ROAR_WARN("streams_ctl(id=%i, cmd=?, data=%p): comp=0x%.8x, cmd=0x%.4x", id, data, comp, cmd);
+ ROAR_DBG("streams_ctl(id=%i, cmd=?, data=%p): comp=0x%.8x, cmd=0x%.4x", id, data, comp, cmd);
 
  switch (comp) {