mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some compiler warnings on arm

Browse source
This commit is contained in:
Wim Taymans 2020-04-03 13:18:02 +02:00
parent df5721ff47
commit ab3a6d3441
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/vulkan/vulkan-utils.c
View file

@ -325,7 +325,7 @@ static VkShaderModule createShaderModule(struct vulkan_state *s, const char* sha
if ((fd = open(shaderFile, 0, O_RDONLY)) == -1) { if ((fd = open(shaderFile, 0, O_RDONLY)) == -1) {
spa_log_error(s->log, "can't open %s: %m", shaderFile); spa_log_error(s->log, "can't open %s: %m", shaderFile);
return NULL; return VK_NULL_HANDLE;
} }
fstat(fd, &stat); fstat(fd, &stat);
@ -344,7 +344,7 @@ static VkShaderModule createShaderModule(struct vulkan_state *s, const char* sha
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
spa_log_error(s->log, "can't create shader %s: %m", shaderFile); spa_log_error(s->log, "can't create shader %s: %m", shaderFile);
return NULL; return VK_NULL_HANDLE;
} }
return shaderModule; return shaderModule;
} }
@ -369,7 +369,7 @@ static int createComputePipeline(struct vulkan_state *s, const char *shader_file
&s->pipelineLayout)); &s->pipelineLayout));
s->computeShaderModule = createShaderModule(s, shader_file); s->computeShaderModule = createShaderModule(s, shader_file);
if (s->computeShaderModule == NULL) if (s->computeShaderModule == VK_NULL_HANDLE)
return -ENOENT; return -ENOENT;
VkPipelineShaderStageCreateInfo shaderStageCreateInfo = { VkPipelineShaderStageCreateInfo shaderStageCreateInfo = {

8
src/modules/module-rtkit.c
View file

@ -485,12 +485,12 @@ static void idle_func(struct spa_source *source)
rttime = pw_rtkit_get_rttime_usec_max(system_bus); rttime = pw_rtkit_get_rttime_usec_max(system_bus);
if (rttime >= 0) { if (rttime >= 0) {
rl.rlim_cur = SPA_MIN(rl.rlim_cur, (long unsigned int)rttime); rl.rlim_cur = SPA_MIN(rl.rlim_cur, (rlim_t)rttime);
rl.rlim_max = SPA_MIN(rl.rlim_max, (long unsigned int)rttime); rl.rlim_max = SPA_MIN(rl.rlim_max, (rlim_t)rttime);
} }
pw_log_debug("rt.prio:%d rt.time.soft:%lu rt.time.hard:%lu", pw_log_debug("rt.prio:%d rt.time.soft:%"PRIi64" rt.time.hard:%"PRIi64,
rtprio, rl.rlim_cur, rl.rlim_max); rtprio, (int64_t)rl.rlim_cur, (int64_t)rl.rlim_max);
if ((r = setrlimit(RLIMIT_RTTIME, &rl)) < 0) if ((r = setrlimit(RLIMIT_RTTIME, &rl)) < 0)
pw_log_debug("setrlimit() failed: %s", strerror(errno)); pw_log_debug("setrlimit() failed: %s", strerror(errno));

2
src/pipewire/impl-node.c
View file

@ -1283,7 +1283,7 @@ static void do_reposition(struct pw_impl_node *driver, struct pw_impl_node *node
src = &node->rt.activation->reposition; src = &node->rt.activation->reposition;
dst = &a->position.segments[0]; dst = &a->position.segments[0];
pw_log_trace(NAME" %p: update position:%lu", node, src->position); pw_log_trace(NAME" %p: update position:%"PRIu64, node, src->position);
dst->version = src->version; dst->version = src->version;
dst->flags = src->flags; dst->flags = src->flags;