Move from local to external osmo* libraries
src/libdebug -> libosmocore src/libselect -> libosmocore src/libtimer -> libosmocore src/libosmocc -> libosmo-cc src/libg711 -> libosmo-cc
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
#include <errno.h>
|
||||
#include "../libsample/sample.h"
|
||||
#include "../libwave/wave.h"
|
||||
#include "../libdebug/debug.h"
|
||||
#include "../liblogging/logging.h"
|
||||
#ifdef HAVE_ALSA
|
||||
#include "../libsound/sound.h"
|
||||
#endif
|
||||
@@ -186,7 +186,7 @@ static void process_signal(int buffer_size)
|
||||
count = dsp_samplerate / 1000;
|
||||
#endif
|
||||
if (count < 0) {
|
||||
PDEBUG(DDSP, DEBUG_ERROR, "Failed to get number of samples in buffer (rc = %d)!\n", count);
|
||||
LOGP(DDSP, LOGL_ERROR, "Failed to get number of samples in buffer (rc = %d)!\n", count);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ static void process_signal(int buffer_size)
|
||||
/* write audio */
|
||||
rc = sound_write(audio, samples, power, count, NULL, NULL, 1);
|
||||
if (rc < 0) {
|
||||
PDEBUG(DDSP, DEBUG_ERROR, "Failed to write TX data to audio device (rc = %d)\n", rc);
|
||||
LOGP(DDSP, LOGL_ERROR, "Failed to write TX data to audio device (rc = %d)\n", rc);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
|
||||
/* init sound */
|
||||
audio = sound_open(dsp_audiodev, NULL, NULL, NULL, 1, 0.0, dsp_samplerate, dsp_buffer, 1.0, 1.0, 4000.0, 2.0);
|
||||
if (!audio) {
|
||||
PDEBUG(DBNETZ, DEBUG_ERROR, "No sound device!\n");
|
||||
LOGP(DBNETZ, LOGL_ERROR, "No sound device!\n");
|
||||
goto exit;
|
||||
}
|
||||
#endif
|
||||
@@ -318,13 +318,13 @@ int main(int argc, char *argv[])
|
||||
if (write_tx_wave) {
|
||||
rc = wave_create_record(&wave_tx_rec, write_tx_wave, dsp_samplerate, 1, 1.0);
|
||||
if (rc < 0) {
|
||||
PDEBUG(DBNETZ, DEBUG_ERROR, "Failed to create WAVE recoding instance!\n");
|
||||
LOGP(DBNETZ, LOGL_ERROR, "Failed to create WAVE recoding instance!\n");
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
#ifndef HAVE_ALSA
|
||||
else {
|
||||
PDEBUG(DBNETZ, DEBUG_ERROR, "No sound support compiled in, so you need to write to a wave file. See help!\n");
|
||||
LOGP(DBNETZ, LOGL_ERROR, "No sound support compiled in, so you need to write to a wave file. See help!\n");
|
||||
goto exit;
|
||||
}
|
||||
#endif
|
||||
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
|
||||
sound_start(audio);
|
||||
#endif
|
||||
|
||||
PDEBUG(DBNETZ, DEBUG_ERROR, "Start audio after pause...\n");
|
||||
LOGP(DBNETZ, LOGL_ERROR, "Start audio after pause...\n");
|
||||
|
||||
process_signal(buffer_size);
|
||||
|
||||
|
Reference in New Issue
Block a user