i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37211 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-06-21 21:00:28 +00:00
parent c53724f7bf
commit fb2ec51289
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/null/null_multi.c
+6 -5
View File
@@ -48,9 +48,10 @@ multi_channel_info channel_descriptions[] = {
static status_t static status_t
get_description(void* cookie, multi_description* data) get_description(void* cookie, multi_description* data)
{ {
dprintf("null_audio: %s\n" , __func__ );
multi_description description; multi_description description;
dprintf("null_audio: %s\n" , __func__ );
if (user_memcpy(&description, data, sizeof(multi_description)) != B_OK) { if (user_memcpy(&description, data, sizeof(multi_description)) != B_OK) {
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
} }
@@ -84,7 +85,7 @@ get_description(void* cookie, multi_description* data)
if (user_memcpy(data, &description, sizeof(multi_description)) != B_OK) if (user_memcpy(data, &description, sizeof(multi_description)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
if (description.request_channel_count if (description.request_channel_count
>= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) { >= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) {
if (user_memcpy(data->channels, if (user_memcpy(data->channels,
@@ -156,7 +157,7 @@ create_group_control(multi_mix_control* multi, int32 idx, int32 parent,
multi->string = string; multi->string = string;
if (name) if (name)
strcpy(multi->name, name); strcpy(multi->name, name);
return multi->id; return multi->id;
} }
@@ -202,7 +203,7 @@ get_buffers(device_t* device, multi_buffer_list* data)
status_t result; status_t result;
dprintf("null_audio: %s\n" , __func__ ); dprintf("null_audio: %s\n" , __func__ );
// Workaround for Haiku multi_audio API, since it prefers // Workaround for Haiku multi_audio API, since it prefers
// to let the driver pick values, while the BeOS multi_audio // to let the driver pick values, while the BeOS multi_audio
// actually gives the user's defaults. // actually gives the user's defaults.