williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libdisplay: Removing dependency from libmobile

Browse Source
This commit is contained in:
Andreas Eversberg
2018-01-21 09:30:00 +01:00
parent d3385b498d
commit 0b129d3c7f
16 changed files with 126 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libmobile/sender.c
View File

@@ -143,8 +143,8 @@ int sender_create(sender_t *sender, int kanal, double sendefrequenz, double empf
*sender_tailp = sender;
sender_tailp = &sender->next;
display_wave_init(sender, samplerate);
display_measurements_init(sender, samplerate);
display_wave_init(&sender->dispwav, samplerate, sender->kanal);
display_measurements_init(&sender->dispmeas, samplerate, sender->kanal);
return 0;
error:
@@ -215,6 +215,13 @@ int sender_open_audio(int latspl)
}
}
#ifdef HAVE_SDR
/* in case of initialized spectrum display (SDR), we add all channels.
* if spectrum display was not initialized (sound card), function call is ignored */
for (inst = sender_head; inst; inst = inst->next)
display_spectrum_add_mark(inst->kanal, inst->empfangsfrequenz);
#endif
return 0;
}
@@ -336,7 +343,7 @@ cant_recover:
sender_send(inst, samples[i], power[i], count);
/* internal loopback: loop back TX audio to RX */
if (inst->loopback == 1) {
display_wave(inst, samples[i], count, inst->max_display);
display_wave(&inst->dispwav, samples[i], count, inst->max_display);
sender_receive(inst, samples[i], count, 0.0);
}
/* do pre emphasis towards radio */
@@ -409,7 +416,7 @@ cant_recover:
de_emphasis(&inst->estate, samples[i], count);
}
if (inst->loopback != 1) {
display_wave(inst, samples[i], count, inst->max_display);
display_wave(&inst->dispwav, samples[i], count, inst->max_display);
sender_receive(inst, samples[i], count, rf_level_db[i]);
}
if (inst->loopback == 3)