mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-16 06:59:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

s/timespec/timeval

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1936 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-07 13:56:07 +00:00
parent 2198c2ec6e
commit 3736246a36
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/rtp/module-rtp-recv.c
View file

@ -31,6 +31,7 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <poll.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
@ -161,10 +162,10 @@ static void sink_input_kill(pa_sink_input* i) {
static int rtpoll_work_cb(pa_rtpoll_item *i) { static int rtpoll_work_cb(pa_rtpoll_item *i) {
pa_memchunk chunk; pa_memchunk chunk;
int64_t k, j, delta; int64_t k, j, delta;
struct timespec now; struct timeval now;
struct session *s; struct session *s;
struct pollfd *p; struct pollfd *p;
pa_assert_se(s = pa_rtpoll_item_get_userdata(i)); pa_assert_se(s = pa_rtpoll_item_get_userdata(i));
p = pa_rtpoll_item_get_pollfd(i, NULL); p = pa_rtpoll_item_get_pollfd(i, NULL);
@ -173,12 +174,12 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) {
pa_log("poll() signalled bad revents."); pa_log("poll() signalled bad revents.");
return -1; return -1;
} }
if ((p->revents & POLLIN) == 0) if ((p->revents & POLLIN) == 0)
return 0; return 0;
p->revents = 0; p->revents = 0;
if (pa_rtp_recv(&s->rtp_context, &chunk, s->userdata->module->core->mempool) < 0) if (pa_rtp_recv(&s->rtp_context, &chunk, s->userdata->module->core->mempool) < 0)
return 0; return 0;
@ -234,7 +235,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) {
static void sink_input_attach(pa_sink_input *i) { static void sink_input_attach(pa_sink_input *i) {
struct session *s; struct session *s;
struct pollfd *p; struct pollfd *p;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
pa_assert_se(s = i->userdata); pa_assert_se(s = i->userdata);
@ -317,7 +318,7 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in
int fd = -1; int fd = -1;
pa_memblock *silence; pa_memblock *silence;
pa_sink_input_new_data data; pa_sink_input_new_data data;
struct timespec now; struct timeval now;
pa_assert(u); pa_assert(u);
pa_assert(sdp_info); pa_assert(sdp_info);
@ -406,7 +407,7 @@ fail:
if (fd >= 0) if (fd >= 0)
pa_close(fd); pa_close(fd);
return NULL; return NULL;
} }
@ -422,7 +423,7 @@ static void session_free(struct session *s) {
pa_assert(s->userdata->n_sessions >= 1); pa_assert(s->userdata->n_sessions >= 1);
s->userdata->n_sessions--; s->userdata->n_sessions--;
pa_hashmap_remove(s->userdata->by_origin, s->sdp_info.origin); pa_hashmap_remove(s->userdata->by_origin, s->sdp_info.origin);
pa_memblockq_free(s->memblockq); pa_memblockq_free(s->memblockq);
pa_sdp_info_destroy(&s->sdp_info); pa_sdp_info_destroy(&s->sdp_info);
pa_rtp_context_destroy(&s->rtp_context); pa_rtp_context_destroy(&s->rtp_context);
@ -461,10 +462,10 @@ static void sap_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event
pa_sdp_info_destroy(&info); pa_sdp_info_destroy(&info);
} else { } else {
struct timespec now; struct timeval now;
pa_rtclock_get(&now); pa_rtclock_get(&now);
pa_atomic_store(&s->timestamp, now.tv_sec); pa_atomic_store(&s->timestamp, now.tv_sec);
pa_sdp_info_destroy(&info); pa_sdp_info_destroy(&info);
} }
} }
@ -473,7 +474,7 @@ static void sap_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event
static void check_death_event_cb(pa_mainloop_api *m, pa_time_event *t, const struct timeval *ptv, void *userdata) { static void check_death_event_cb(pa_mainloop_api *m, pa_time_event *t, const struct timeval *ptv, void *userdata) {
struct session *s, *n; struct session *s, *n;
struct userdata *u = userdata; struct userdata *u = userdata;
struct timespec now; struct timeval now;
struct timeval tv; struct timeval tv;
pa_assert(m); pa_assert(m);
@ -484,7 +485,7 @@ static void check_death_event_cb(pa_mainloop_api *m, pa_time_event *t, const str
pa_rtclock_get(&now); pa_rtclock_get(&now);
pa_log_debug("Checking for dead streams ..."); pa_log_debug("Checking for dead streams ...");
for (s = u->sessions; s; s = n) { for (s = u->sessions; s; s = n) {
int k; int k;
n = s->next; n = s->next;
@ -511,7 +512,7 @@ int pa__init(pa_module*m) {
const char *sap_address; const char *sap_address;
int fd = -1; int fd = -1;
struct timeval tv; struct timeval tv;
pa_assert(m); pa_assert(m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
@ -554,7 +555,7 @@ int pa__init(pa_module*m) {
pa_gettimeofday(&tv); pa_gettimeofday(&tv);
pa_timeval_add(&tv, DEATH_TIMEOUT * PA_USEC_PER_SEC); pa_timeval_add(&tv, DEATH_TIMEOUT * PA_USEC_PER_SEC);
u->check_death_event = m->core->mainloop->time_new(m->core->mainloop, &tv, check_death_event_cb, u); u->check_death_event = m->core->mainloop->time_new(m->core->mainloop, &tv, check_death_event_cb, u);
pa_modargs_free(ma); pa_modargs_free(ma);
return 0; return 0;
@ -572,7 +573,7 @@ fail:
void pa__done(pa_module*m) { void pa__done(pa_module*m) {
struct userdata *u; struct userdata *u;
struct session *s; struct session *s;
pa_assert(m); pa_assert(m);
if (!(u = m->userdata)) if (!(u = m->userdata))
@ -589,7 +590,7 @@ void pa__done(pa_module*m) {
if (u->by_origin) { if (u->by_origin) {
while ((s = pa_hashmap_get_first(u->by_origin))) while ((s = pa_hashmap_get_first(u->by_origin)))
session_free(s); session_free(s);
pa_hashmap_free(u->by_origin, NULL, NULL); pa_hashmap_free(u->by_origin, NULL, NULL);
} }