Changeset 792

Show
Ignore:
Timestamp:
01/01/08 08:20:44 (13 years ago)
Author:
ppalmers
Message:

make teststreaming3 a cpp app

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/tests/streaming/SConscript

    r742 r792  
    3030env.PrependUnique( LIBS=["ffado"] ) 
    3131 
    32 apps = "teststreaming teststreaming2 teststreaming3
     32apps = "teststreaming teststreaming2
    3333if env.GetOption('clean') or env['ALSA_SEQ_OUTPUT']: 
    3434        apps += " testmidistreaming1" 
     
    3737        env.Program( target=app, source = [ app+".c", "debugtools.c" ] ) 
    3838 
     39cppapps = "teststreaming3" 
    3940 
     41for app in env.Split( cppapps ): 
     42        env.Program( target=app, source = [ app+".cpp" ] ) 
     43 
     44 
  • trunk/libffado/tests/streaming/teststreaming3.cpp

    r786 r792  
    155155     
    156156    /* allocate intermediate buffers */ 
    157     audiobuffers_in = calloc(nb_in_channels, sizeof(float *)); 
     157    audiobuffers_in = (float **)calloc(nb_in_channels, sizeof(float *)); 
    158158    for (i=0; i < nb_in_channels; i++) { 
    159         audiobuffers_in[i] = calloc(PERIOD_SIZE+1, sizeof(float)); 
     159        audiobuffers_in[i] = (float *)calloc(PERIOD_SIZE+1, sizeof(float)); 
    160160             
    161161        switch (ffado_streaming_get_capture_stream_type(dev,i)) { 
     
    173173    } 
    174174     
    175     audiobuffers_out = calloc(nb_out_channels, sizeof(float)); 
     175    audiobuffers_out = (float **)calloc(nb_out_channels, sizeof(float)); 
    176176    for (i=0; i < nb_out_channels; i++) { 
    177         audiobuffers_out[i] = calloc(PERIOD_SIZE+1, sizeof(float)); 
     177        audiobuffers_out[i] = (float *)calloc(PERIOD_SIZE+1, sizeof(float)); 
    178178             
    179179        switch (ffado_streaming_get_playback_stream_type(dev,i)) { 
     
    191191    } 
    192192     
    193     nullbuffer = calloc(PERIOD_SIZE+1, sizeof(float)); 
     193    nullbuffer = (float *)calloc(PERIOD_SIZE+1, sizeof(float)); 
    194194     
    195195