Changeset 1493:405133c68d28 in roaraudio
- Timestamp:
- 03/31/09 19:58:23 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/codecfilter_vorbis.c
r1239 r1493 246 246 247 247 int cf_vorbis_update_stream (struct codecfilter_vorbis_inst * self) { 248 #ifdef ROAR_SUPPORT_META 248 249 vorbis_info *vi = ov_info(&(self->vf), -1); 249 250 char **ptr = ov_comment(&(self->vf), -1)->user_comments; … … 323 324 324 325 stream_meta_finalize(s->id); 326 #endif 325 327 //printf("RPG: mul=%i, div=%i\n", self->stream->mixer.rpg_mul, self->stream->mixer.rpg_div); 326 328 return 0; … … 330 332 #ifdef ROAR_HAVE_LIBVORBISENC 331 333 int srn = self->encoder.srn; // this value is allrady inited... 334 #ifdef ROAR_SUPPORT_META 332 335 int len = 0; 333 336 int i; 334 337 int types[ROAR_META_MAX_PER_STREAM]; 338 #endif 335 339 int sid = ROAR_STREAM(self->stream)->id; 336 340 char val[LIBROAR_BUFFER_MSGDATA]; … … 348 352 vorbis_comment_add_tag(&(self->encoder.vc), "ENCODER", "RoarAudio Vorbis codecfilter"); 349 353 354 #ifdef ROAR_SUPPORT_META 350 355 if ( (len = stream_meta_list(sid, types, ROAR_META_MAX_PER_STREAM)) != -1 ) { 351 356 for (i = 0; i < len; i++) { … … 355 360 } 356 361 } 362 #endif 357 363 358 364 if( vorbis_encode_init_vbr(&(self->encoder.vi), (long) ROAR_STREAM(self->stream)->info.channels, -
roard/include/req.h
r1162 r1493 40 40 int req_on_passfh (int client, struct roar_message * mes, char * data); 41 41 42 #ifdef ROAR_SUPPORT_META 42 43 int req_on_set_meta (int client, struct roar_message * mes, char * data); 43 44 int req_on_get_meta (int client, struct roar_message * mes, char * data); 44 45 int req_on_list_meta (int client, struct roar_message * mes, char * data); 46 #endif 45 47 46 48 int req_on_get_standby (int client, struct roar_message * mes, char * data); -
roard/include/streams.h
r1224 r1493 56 56 void * output; 57 57 struct roar_mixer_settings mixer; 58 #ifdef ROAR_SUPPORT_META 58 59 struct roar_meta meta[ROAR_META_MAX_PER_STREAM]; 60 #endif 59 61 int is_new; 60 62 int codecfilter; -
roard/meta.c
r1238 r1493 24 24 25 25 #include "roard.h" 26 27 #ifdef ROAR_SUPPORT_META 26 28 27 29 int stream_meta_set (int id, int type, char * name, char * val) { … … 231 233 } 232 234 235 #endif 236 233 237 //ll -
roard/req.c
r1223 r1493 192 192 } 193 193 194 #ifdef ROAR_SUPPORT_META 194 195 int req_on_set_meta (int client, struct roar_message * mes, char * data) { 195 196 int type; … … 318 319 return 0; 319 320 } 321 #endif 320 322 321 323 int req_on_server_oinfo (int client, struct roar_message * mes, char * data) {
Note: See TracChangeset
for help on using the changeset viewer.