Moved from poll to select
Alsa is still polled, because we continuously receive audio.
This commit is contained in:
parent
7da5a3f42b
commit
323d7079a4
|
@ -42,6 +42,7 @@ src/libsample/libsample.a
|
||||||
src/libsamplerate/libsamplerate.a
|
src/libsamplerate/libsamplerate.a
|
||||||
src/libfilter/libfilter.a
|
src/libfilter/libfilter.a
|
||||||
src/libtimer/libtimer.a
|
src/libtimer/libtimer.a
|
||||||
|
src/libselect/libselect.a
|
||||||
src/libsound/libsound.a
|
src/libsound/libsound.a
|
||||||
src/telephone/osmo-cc-alsa-endpoint
|
src/telephone/osmo-cc-alsa-endpoint
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,7 @@ AC_OUTPUT(
|
||||||
src/libsamplerate/Makefile
|
src/libsamplerate/Makefile
|
||||||
src/libfilter/Makefile
|
src/libfilter/Makefile
|
||||||
src/libtimer/Makefile
|
src/libtimer/Makefile
|
||||||
|
src/libselect/Makefile
|
||||||
src/libjitter/Makefile
|
src/libjitter/Makefile
|
||||||
src/libosmocc/Makefile
|
src/libosmocc/Makefile
|
||||||
src/libg711/Makefile
|
src/libg711/Makefile
|
||||||
|
|
|
@ -7,6 +7,7 @@ SUBDIRS = \
|
||||||
libsamplerate \
|
libsamplerate \
|
||||||
libfilter \
|
libfilter \
|
||||||
libtimer \
|
libtimer \
|
||||||
|
libselect \
|
||||||
libjitter \
|
libjitter \
|
||||||
libosmocc \
|
libosmocc \
|
||||||
libg711
|
libg711
|
||||||
|
|
|
@ -14,9 +14,10 @@ osmo_cc_alsa_endpoint_LDADD = \
|
||||||
../libsample/libsample.a \
|
../libsample/libsample.a \
|
||||||
../libsamplerate/libsamplerate.a \
|
../libsamplerate/libsamplerate.a \
|
||||||
../libfilter/libfilter.a \
|
../libfilter/libfilter.a \
|
||||||
../libtimer/libtimer.a \
|
|
||||||
../libjitter/libjitter.a \
|
|
||||||
../libosmocc/libosmocc.a \
|
../libosmocc/libosmocc.a \
|
||||||
|
../libtimer/libtimer.a \
|
||||||
|
../libselect/libselect.a \
|
||||||
|
../libjitter/libjitter.a \
|
||||||
../libg711/libg711.a \
|
../libg711/libg711.a \
|
||||||
-lm
|
-lm
|
||||||
|
|
||||||
|
|
|
@ -292,7 +292,6 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
process_timer();
|
process_timer();
|
||||||
alsa_work(telephone_ep);
|
alsa_work(telephone_ep);
|
||||||
rtp_work(telephone_ep);
|
|
||||||
do {
|
do {
|
||||||
w = 0;
|
w = 0;
|
||||||
w |= osmo_cc_handle();
|
w |= osmo_cc_handle();
|
||||||
|
|
|
@ -363,18 +363,6 @@ void alsa_work(telephone_t *telephone_ep)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void rtp_work(telephone_t *telephone_ep)
|
|
||||||
{
|
|
||||||
call_t *call;
|
|
||||||
|
|
||||||
call = telephone_ep->call_list;
|
|
||||||
while (call) {
|
|
||||||
if (call->cc_session)
|
|
||||||
osmo_cc_session_handle(call->cc_session, call);
|
|
||||||
call = call->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* handle message from CC
|
* handle message from CC
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
|
|
||||||
#include "../libtimer/timer.h"
|
#include "../libtimer/timer.h"
|
||||||
|
#include "../libselect/select.h"
|
||||||
#include "../libosmocc/endpoint.h"
|
#include "../libosmocc/endpoint.h"
|
||||||
#include "../libsample/sample.h"
|
#include "../libsample/sample.h"
|
||||||
#include "../libsamplerate/samplerate.h"
|
#include "../libsamplerate/samplerate.h"
|
||||||
|
@ -72,5 +73,4 @@ void cc_message(osmo_cc_endpoint_t *ep, uint32_t callref, osmo_cc_msg_t *msg);
|
||||||
int ui_init(const char *remote_id, int autoalert, int autoanswer);
|
int ui_init(const char *remote_id, int autoalert, int autoanswer);
|
||||||
int ui_work(telephone_t *telephone_ep, int c);
|
int ui_work(telephone_t *telephone_ep, int c);
|
||||||
void alsa_work(telephone_t *telephone_ep);
|
void alsa_work(telephone_t *telephone_ep);
|
||||||
void rtp_work(telephone_t *telephone_ep);
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue