Changeset 1493:405133c68d28 in roaraudio for roard/codecfilter_vorbis.c

Timestamp:

03/31/09 19:58:23 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

test for ROAR_SUPPORT_META and disable meta data code

File:

• roard/codecfilter_vorbis.c (modified) (5 diffs)

roard/codecfilter_vorbis.c

@@ -246 +246 @@
 
 int cf_vorbis_update_stream (struct codecfilter_vorbis_inst * self) {
+#ifdef ROAR_SUPPORT_META
  vorbis_info *vi = ov_info(&(self->vf), -1);
  char **ptr = ov_comment(&(self->vf), -1)->user_comments;
@@ -323 +324 @@
 
  stream_meta_finalize(s->id);
+#endif
  //printf("RPG: mul=%i, div=%i\n", self->stream->mixer.rpg_mul, self->stream->mixer.rpg_div);
  return 0;
@@ -330 +332 @@
 #ifdef ROAR_HAVE_LIBVORBISENC
  int srn = self->encoder.srn; // this value is allrady inited...
+#ifdef ROAR_SUPPORT_META
  int len = 0;
  int i;
  int types[ROAR_META_MAX_PER_STREAM];
+#endif
  int sid = ROAR_STREAM(self->stream)->id;
  char val[LIBROAR_BUFFER_MSGDATA];
@@ -348 +352 @@
   vorbis_comment_add_tag(&(self->encoder.vc), "ENCODER", "RoarAudio Vorbis codecfilter");
 
+#ifdef ROAR_SUPPORT_META
   if ( (len = stream_meta_list(sid, types, ROAR_META_MAX_PER_STREAM)) != -1 ) {
    for (i = 0; i < len; i++) {
@@ -355 +360 @@
    }
   }
+#endif
 
   if( vorbis_encode_init_vbr(&(self->encoder.vi), (long) ROAR_STREAM(self->stream)->info.channels,