delay initialization of lame until after config parsing is complete

Author: gabeschine

src/config.cpp

@@ -34,6 +34,7 @@ using namespace std;
 static int parse_outputs(libconfig::Setting& outs, channel_t* channel, int i, int j, bool parsing_mixers) {
     int oo = 0;
     for (int o = 0; o < channel->output_count; o++) {
+        channel->outputs[oo].has_mp3_output = false;
         channel->outputs[oo].lame = NULL;
         channel->outputs[oo].lamebuf = NULL;
 
@@ -95,8 +96,7 @@ static int parse_outputs(libconfig::Setting& outs, channel_t* channel, int i, in
             }
 #endif /* LIBSHOUT_HAS_TLS */
 
-            channel->outputs[oo].lame = airlame_init(channel->mode, channel->highpass, channel->lowpass);
-            channel->outputs[oo].lamebuf = (unsigned char*)malloc(sizeof(unsigned char) * LAMEBUF_SIZE);
+            channel->outputs[oo].has_mp3_output = true;
         } else if (!strncmp(outs[o]["type"], "file", 4)) {
             channel->outputs[oo].data = XCALLOC(1, sizeof(struct file_data));
             channel->outputs[oo].type = O_FILE;
@@ -122,8 +122,7 @@ static int parse_outputs(libconfig::Setting& outs, channel_t* channel, int i, in
             fdata->split_on_transmission = outs[o].exists("split_on_transmission") ? (bool)(outs[o]["split_on_transmission"]) : false;
             fdata->include_freq = outs[o].exists("include_freq") ? (bool)(outs[o]["include_freq"]) : false;
 
-            channel->outputs[oo].lame = airlame_init(channel->mode, channel->highpass, channel->lowpass);
-            channel->outputs[oo].lamebuf = (unsigned char*)malloc(sizeof(unsigned char) * LAMEBUF_SIZE);
+            channel->outputs[oo].has_mp3_output = true;
 
             if (fdata->split_on_transmission) {
                 if (parsing_mixers) {

src/rtl_airband.cpp

@@ -266,6 +266,10 @@ void init_demod(demod_params_t* params, Signal* signal, int device_start, int de
 }
 
 bool init_output(channel_t* channel, output_t* output) {
+    if (output->has_mp3_output) {
+        output->lame = airlame_init(channel->mode, channel->highpass, channel->lowpass);
+        output->lamebuf = (unsigned char*)malloc(sizeof(unsigned char) * LAMEBUF_SIZE);
+    }
     if (output->type == O_ICECAST) {
         shout_setup((icecast_data*)(output->data), channel->mode);
     } else if (output->type == O_UDP_STREAM) {

src/rtl_airband.h

@@ -184,9 +184,14 @@ struct output_t {
     bool active;
     void* data;
 
-    // set if this output performs mp3 encoding
+    // set to true in order to initialize `lame` and `lamebuf` after config parsing
+    // is complete
+    bool has_mp3_output;
+
+    // lame encoder and buffer for mp3 output. initialized after config parsing
+    // if `uses_mp3_output` is true
     lame_t lame;
-    unsigned char* lamebuf;  // temporary buffer used for lame encoding
+    unsigned char* lamebuf;
 };
 
 struct freq_tag {