consumer avformat added, various cleanups and consumer realtime switching

[melted] / src / modules / sdl / consumer_sdl.c

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 7d867df..238bf2a 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -246,11 +246,9 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud
        mlt_audio_format afmt = mlt_audio_pcm;
 
        // Set the preferred params of the test card signal
-       int channels = 2;
-       int frequency = 48000;
+       int channels = mlt_properties_get_int( properties, "channels" );
+       int frequency = mlt_properties_get_int( properties, "frequency" );
        static int counter = 0;
-       if ( mlt_properties_get_int( properties, "frequency" ) != 0 )
-               frequency =  mlt_properties_get_int( properties, "frequency" );
 
        int samples = mlt_sample_calculator( mlt_properties_get_double( this->properties, "fps" ), frequency, counter++ );