Changeset 1493:405133c68d28 in roaraudio


Ignore:
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

Location:
roard
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • roard/codecfilter_vorbis.c

    r1239 r1493  
    246246 
    247247int cf_vorbis_update_stream (struct codecfilter_vorbis_inst * self) { 
     248#ifdef ROAR_SUPPORT_META 
    248249 vorbis_info *vi = ov_info(&(self->vf), -1); 
    249250 char **ptr = ov_comment(&(self->vf), -1)->user_comments; 
     
    323324 
    324325 stream_meta_finalize(s->id); 
     326#endif 
    325327 //printf("RPG: mul=%i, div=%i\n", self->stream->mixer.rpg_mul, self->stream->mixer.rpg_div); 
    326328 return 0; 
     
    330332#ifdef ROAR_HAVE_LIBVORBISENC 
    331333 int srn = self->encoder.srn; // this value is allrady inited... 
     334#ifdef ROAR_SUPPORT_META 
    332335 int len = 0; 
    333336 int i; 
    334337 int types[ROAR_META_MAX_PER_STREAM]; 
     338#endif 
    335339 int sid = ROAR_STREAM(self->stream)->id; 
    336340 char val[LIBROAR_BUFFER_MSGDATA]; 
     
    348352  vorbis_comment_add_tag(&(self->encoder.vc), "ENCODER", "RoarAudio Vorbis codecfilter"); 
    349353 
     354#ifdef ROAR_SUPPORT_META 
    350355  if ( (len = stream_meta_list(sid, types, ROAR_META_MAX_PER_STREAM)) != -1 ) { 
    351356   for (i = 0; i < len; i++) { 
     
    355360   } 
    356361  } 
     362#endif 
    357363 
    358364  if( vorbis_encode_init_vbr(&(self->encoder.vi), (long) ROAR_STREAM(self->stream)->info.channels, 
  • roard/include/req.h

    r1162 r1493  
    4040int req_on_passfh      (int client, struct roar_message * mes, char * data); 
    4141 
     42#ifdef ROAR_SUPPORT_META 
    4243int req_on_set_meta    (int client, struct roar_message * mes, char * data); 
    4344int req_on_get_meta    (int client, struct roar_message * mes, char * data); 
    4445int req_on_list_meta   (int client, struct roar_message * mes, char * data); 
     46#endif 
    4547 
    4648int req_on_get_standby (int client, struct roar_message * mes, char * data); 
  • roard/include/streams.h

    r1224 r1493  
    5656 void  * output; 
    5757 struct roar_mixer_settings mixer; 
     58#ifdef ROAR_SUPPORT_META 
    5859 struct roar_meta meta[ROAR_META_MAX_PER_STREAM]; 
     60#endif 
    5961 int is_new; 
    6062 int codecfilter; 
  • roard/meta.c

    r1238 r1493  
    2424 
    2525#include "roard.h" 
     26 
     27#ifdef ROAR_SUPPORT_META 
    2628 
    2729int stream_meta_set   (int id, int type, char * name, char * val) { 
     
    231233} 
    232234 
     235#endif 
     236 
    233237//ll 
  • roard/req.c

    r1223 r1493  
    192192} 
    193193 
     194#ifdef ROAR_SUPPORT_META 
    194195int req_on_set_meta    (int client, struct roar_message * mes, char * data) { 
    195196 int type; 
     
    318319 return 0; 
    319320} 
     321#endif 
    320322 
    321323int req_on_server_oinfo    (int client, struct roar_message * mes, char * data) { 
Note: See TracChangeset for help on using the changeset viewer.