Changeset 337

Show
Ignore:
Timestamp:
01/30/06 18:50:43 (3 years ago)
Author:
conrad
Message:

get rid of memory leak in allocation of channelset_defaults

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • libremix/trunk/src/libremix/remix_channelset.c

    r161 r337  
    3434 
    3535void 
    36 remix_channelset_initialise_defaults (RemixEnv * env) 
     36remix_channelset_defaults_initialise (RemixEnv * env) 
    3737{ 
    3838  if (REMIX_MONO == NULL) { 
    …… 
    5252  return; 
    5353} 
     54 
     55void 
     56remix_channelset_defaults_destroy (RemixEnv * env) 
     57{ 
     58  if (REMIX_MONO != NULL) { 
     59    cd_set_free (env, REMIX_MONO); 
     60    REMIX_MONO = NULL; 
     61  } 
     62 
     63  if (REMIX_STEREO != NULL) { 
     64    cd_set_free (env, REMIX_STEREO); 
     65    REMIX_STEREO = NULL; 
     66  } 
     67} 

  • libremix/trunk/src/libremix/remix_context.c

    r161 r337  
    4141  /* XXX: remix_destroy_list (env, world->plugins); */ 
    4242  /* XXX:  remix_destroy_list (env, world->bases); */ 
     43  remix_channelset_defaults_destroy (env); 
    4344  remix_free (ctx); 
    4445  remix_free (world); 
    …… 
    130131 
    131132  env = remix_add_thread_context (ctx, world); 
    132   remix_channelset_initialise_defaults (env); 
     133  remix_channelset_defaults_initialise (env); 
    133134  ctx->channels = REMIX_MONO; 
    134135 

  • libremix/trunk/src/libremix/remix_private.h

    r320 r337  
    286286 
    287287/* remix_plugin */ 
    288 void remix_plugin_initialise_defaults (RemixEnv * env); 
     288void remix_plugin_defaults_initialise (RemixEnv * env); 
    289289 
    290290/* remix_deck */ 
    …… 
    361361/* remix_channelset */ 
    362362void remix_channelset_initialise_defaults (RemixEnv * env); 
     363void remix_channelset_defaults_destroy (RemixEnv * env); 
    363364 
    364365/* remix_chunk */ 

  • libremix/trunk/src/tests/noop.c

    r335 r337  
    3030  env = remix_init (); 
    3131 
     32  INFO ("+ Purging RemixEnv"); 
     33  remix_purge (env); 
     34 
    3235  return 0; 
    3336}