Changeset 2266:5895d421650e in roaraudio for plugins/gstreamer0.10
- Timestamp:
- 08/04/09 12:09:19 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/gstreamer0.10/roarmixer.c
r2119 r2266 218 218 const GList *item; 219 219 220 if ( mixer == NULL || mixer->tracklist == NULL ) 221 return FALSE; 222 220 223 for (item = mixer->tracklist; item != NULL; item = item->next) 221 224 if (item->data == roartrack) … … 231 234 GstMixerTrack *track; 232 235 233 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = ?", mixer); 236 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = ? // ########################", mixer); 237 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p): tracklist=%p", mixer, mixer->tracklist); 234 238 235 239 if (mixer->tracklist) { … … 238 242 } 239 243 244 if (mixer->tracklist) { 245 g_list_foreach(mixer->tracklist, (GFunc) g_object_unref, NULL); 246 g_list_free(mixer->tracklist); 247 mixer->tracklist = NULL; 248 } 249 250 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p): tracklist=%p", mixer, mixer->tracklist); 251 240 252 if ( (num = roar_list_streams(&(mixer->con), id, ROAR_STREAMS_MAX)) == -1 ) { 241 253 return; … … 245 257 for (i = 0; i < num; i++) { 246 258 track = gst_roarmixer_track_new(mixer, id[i]); 259 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p): track=%p", mixer, track); 260 261 if ( track == NULL ) 262 continue; 263 247 264 mixer->tracklist = g_list_append(mixer->tracklist, track); 248 265 } 249 266 250 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = (void)", mixer); 267 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p): tracklist=%p", mixer, mixer->tracklist); 268 269 ROAR_WARN("gst_roarmixer_updatestreamlist(mixer=%p) = (void) // ###################", mixer); 251 270 } 252 271 … … 256 275 gst_roarmixer_updatestreamlist(mixer); 257 276 277 ROAR_WARN("gst_roarmixer_list_tracks(mixer=%p) = %p", mixer, mixer->tracklist); 258 278 return (const GList *) mixer->tracklist; 259 279 } … … 262 282 GstMixerTrack * track, 263 283 gint * volumes) { 264 265 284 GstRoarMixerTrack *roartrack = GST_ROARMIXER_TRACK(track); 266 285 int channels; … … 353 372 //memset(track, 0, sizeof(*track)); 354 373 track->stream_id = -1; 374 ROAR_WARN("gst_roarmixer_track_init(track=%p) = (void)", track); 355 375 } 356 376 … … 383 403 if ( (num = roar_list_clients(&(mixer->con), id, ROAR_CLIENTS_MAX)) != -1 ) { 384 404 for (i = 0; i < num; i++) { 385 ROAR_ WARN("gst_roarmixer_track_new(*): stream %i -->> client %i?", stream_id, id[i]);405 ROAR_DBG("gst_roarmixer_track_new(*): stream %i -->> client %i?", stream_id, id[i]); 386 406 if ( roar_get_client(&(mixer->con), &c, id[i]) != -1 ) { 387 407 for (h = 0; h < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; h++) { 388 ROAR_ WARN("gst_roarmixer_track_new(*): stream %i <-> %i -->> client %i?", stream_id, c.streams[h], id[i]);408 ROAR_DBG("gst_roarmixer_track_new(*): stream %i <-> %i -->> client %i?", stream_id, c.streams[h], id[i]); 389 409 if ( c.streams[h] == stream_id ) { 390 410 clientname = c.name;
Note: See TracChangeset
for help on using the changeset viewer.