mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
64 bit fixes and minor gcc shut ups
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1656 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
5e96d5da78
commit
e381dd9e4d
8 changed files with 10 additions and 11 deletions
|
|
@ -191,7 +191,7 @@ int pa_asyncmsgq_get(pa_asyncmsgq *a, pa_msgobject **object, int *code, void **u
|
||||||
if (chunk)
|
if (chunk)
|
||||||
*chunk = a->current->memchunk;
|
*chunk = a->current->memchunk;
|
||||||
|
|
||||||
pa_log_debug("Get q=%p object=%p (%s) code=%i data=%p chunk.length=%u", (void*) a, (void*) a->current->object, a->current->object ? a->current->object->parent.type_name : NULL, a->current->code, (void*) a->current->userdata, a->current->memchunk.length);
|
pa_log_debug("Get q=%p object=%p (%s) code=%i data=%p chunk.length=%lu", (void*) a, (void*) a->current->object, a->current->object ? a->current->object->parent.type_name : NULL, a->current->code, (void*) a->current->userdata, (unsigned long) a->current->memchunk.length);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ enum {
|
||||||
|
|
||||||
typedef struct pa_asyncmsgq pa_asyncmsgq;
|
typedef struct pa_asyncmsgq pa_asyncmsgq;
|
||||||
|
|
||||||
pa_asyncmsgq* pa_asyncmsgq_new(size_t size);
|
pa_asyncmsgq* pa_asyncmsgq_new(unsigned size);
|
||||||
pa_asyncmsgq* pa_asyncmsgq_ref(pa_asyncmsgq *q);
|
pa_asyncmsgq* pa_asyncmsgq_ref(pa_asyncmsgq *q);
|
||||||
void pa_asyncmsgq_unref(pa_asyncmsgq* q);
|
void pa_asyncmsgq_unref(pa_asyncmsgq* q);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
typedef struct pa_asyncq pa_asyncq;
|
typedef struct pa_asyncq pa_asyncq;
|
||||||
|
|
||||||
pa_asyncq* pa_asyncq_new(size_t size);
|
pa_asyncq* pa_asyncq_new(unsigned size);
|
||||||
void pa_asyncq_free(pa_asyncq* q, pa_free_cb_t free_cb);
|
void pa_asyncq_free(pa_asyncq* q, pa_free_cb_t free_cb);
|
||||||
|
|
||||||
void* pa_asyncq_pop(pa_asyncq *q, int wait);
|
void* pa_asyncq_pop(pa_asyncq *q, int wait);
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ static int generate(int fd, void *ret_data, size_t length) {
|
||||||
pa_random(ret_data, length);
|
pa_random(ret_data, length);
|
||||||
|
|
||||||
lseek(fd, 0, SEEK_SET);
|
lseek(fd, 0, SEEK_SET);
|
||||||
ftruncate(fd, 0);
|
(void) ftruncate(fd, 0);
|
||||||
|
|
||||||
if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) {
|
if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) {
|
||||||
pa_log("Failed to write cookie file: %s", pa_cstrerror(errno));
|
pa_log("Failed to write cookie file: %s", pa_cstrerror(errno));
|
||||||
|
|
|
||||||
|
|
@ -164,8 +164,8 @@ int pa_scache_add_item(pa_core *c, const char *name, const pa_sample_spec *ss, c
|
||||||
if (idx)
|
if (idx)
|
||||||
*idx = e->index;
|
*idx = e->index;
|
||||||
|
|
||||||
pa_log_debug("created sample \"%s\" (#%d), %d bytes with sample spec %s",
|
pa_log_debug("created sample \"%s\" (#%d), %lu bytes with sample spec %s",
|
||||||
name, e->index, e->memchunk.length,
|
name, e->index, (unsigned long) e->memchunk.length,
|
||||||
pa_sample_spec_snprint(st, sizeof(st), &e->sample_spec));
|
pa_sample_spec_snprint(st, sizeof(st), &e->sample_spec));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -316,7 +316,6 @@ int pa_scache_play_item_by_name(pa_core *c, const char *name, const char*sink_na
|
||||||
return pa_scache_play_item(c, name, sink, volume);
|
return pa_scache_play_item(c, name, sink, volume);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const char * pa_scache_get_name_by_id(pa_core *c, uint32_t id) {
|
const char * pa_scache_get_name_by_id(pa_core *c, uint32_t id) {
|
||||||
pa_scache_entry *e;
|
pa_scache_entry *e;
|
||||||
assert(c && id != PA_IDXSET_INVALID);
|
assert(c && id != PA_IDXSET_INVALID);
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
|
||||||
uid = getuid();
|
uid = getuid();
|
||||||
if (gid == (gid_t)-1)
|
if (gid == (gid_t)-1)
|
||||||
gid = getgid();
|
gid = getgid();
|
||||||
chown(dir, uid, gid);
|
(void) chown(dir, uid, gid);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHMOD
|
#ifdef HAVE_CHMOD
|
||||||
|
|
|
||||||
|
|
@ -311,7 +311,7 @@ pa_memblock *pa_memblock_new_pool(pa_mempool *p, size_t length) {
|
||||||
pa_atomic_ptr_store(&b->data, mempool_slot_data(slot));
|
pa_atomic_ptr_store(&b->data, mempool_slot_data(slot));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
pa_log_debug("Memory block too large for pool: %u > %u", length, p->block_size - sizeof(struct mempool_slot));
|
pa_log_debug("Memory block too large for pool: %lu > %lu", (unsigned long) length, (unsigned long) (p->block_size - sizeof(struct mempool_slot)));
|
||||||
pa_atomic_inc(&p->stat.n_too_large_for_pool);
|
pa_atomic_inc(&p->stat.n_too_large_for_pool);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -738,7 +738,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
|
||||||
|
|
||||||
volume_is_norm = pa_cvolume_is_norm(&info->sink_input->thread_info.volume);
|
volume_is_norm = pa_cvolume_is_norm(&info->sink_input->thread_info.volume);
|
||||||
|
|
||||||
pa_log_debug("Buffering %u bytes ...", info->buffer_bytes);
|
pa_log_debug("Buffering l%u bytes ...", (unsigned long) info->buffer_bytes);
|
||||||
|
|
||||||
while (info->buffer_bytes > 0) {
|
while (info->buffer_bytes > 0) {
|
||||||
pa_memchunk memchunk;
|
pa_memchunk memchunk;
|
||||||
|
|
@ -772,7 +772,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
|
||||||
|
|
||||||
pa_memblockq_sink_input_set_queue(info->ghost_sink_input, info->buffer);
|
pa_memblockq_sink_input_set_queue(info->ghost_sink_input, info->buffer);
|
||||||
|
|
||||||
pa_log_debug("Buffered %u bytes ...", pa_memblockq_get_length(info->buffer));
|
pa_log_debug("Buffered %lu bytes ...", (unsigned long) pa_memblockq_get_length(info->buffer));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Let's remove the sink input ...*/
|
/* Let's remove the sink input ...*/
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue