whoops

scripts/1-rtp.lua

@@ -71,8 +71,8 @@ function rds.ext.toggle_rtp(ertp)
 end
 
 function rds.ext.set_rtplus_tags(ertp, t1, s1, l1, t2, s2, l2)
-    rds.ext.set_rds_rtp_meta(ertp, true)
-    rds.ext.toggle_rds_rtp(ertp)
+    rds.ext.set_rtp_meta(ertp, true)
+    rds.ext.toggle_rtp(ertp)
     userdata.set_offset(ertp and (USERDATA_RTP_OFFSET+8) or (USERDATA_RTP_OFFSET+1), 6, string.char(t1, s1, l1, t2, s2, l2))
 end
 function rds.ext.get_rtplus_tags(ertp)

src/modulator.c

@@ -3,8 +3,6 @@
 
 void init_rds_modulator(RDSModulator* rdsMod, RDSEncoder* enc, uint8_t num_streams) {
 	memset(rdsMod, 0, sizeof(RDSModulator));
-	rdsMod->params.level = 1.0f;
-	rdsMod->params.rdsgen = 1;
 	rdsMod->num_streams = num_streams;
 
 	memset(enc, 0, sizeof(RDSEncoder));
@@ -20,9 +18,6 @@ void init_rds_modulator(RDSModulator* rdsMod, RDSEncoder* enc, uint8_t num_strea
 		rdsMod->data[i].symbol_shift = i * M_PI / 2.0f;
 		rdsMod->data[i].bit_pos = BITS_PER_GROUP;
 	}
-
-	if(modulatorsaved()) Modulator_loadFromFile(&rdsMod->params);
-	else Modulator_saveToFile(&rdsMod->params);
 }
 
 void cleanup_rds_modulator(RDSModulator* rdsMod) {

src/rds95.c

@@ -167,9 +167,9 @@ int main(int argc, char **argv) {
 	}
 
 	RDSModulator rdsModulator = {0};
-    init_lua(&rdsModulator);
-
+	
 	RDSEncoder rdsEncoder = {0};
+    init_lua(&rdsEncoder);
 	init_rds_modulator(&rdsModulator, &rdsEncoder, config.num_streams);
 	init_rds_encoder(&rdsEncoder);
 
@@ -255,7 +255,6 @@ exit:
 	if (is_tcp_server_running()) close_tcp_server();
 
 	encoder_saveToFile(&rdsEncoder);
-	Modulator_saveToFile(&rdsModulator.params);
 	printf("Saved to file\n");
 
 	cleanup_rds_modulator(&rdsModulator);