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

should fix bug #1328, how could this be not noticed until now ...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21696 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-07-24 19:34:30 +00:00
parent abc4720231
commit 96cf4bfb88
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/auich/multi.c
+3
View File
@@ -1090,6 +1090,9 @@ auich_free(void* cookie)
while(!LIST_EMPTY(&card->streams)) { while(!LIST_EMPTY(&card->streams)) {
auich_stream_delete(LIST_FIRST(&card->streams)); auich_stream_delete(LIST_FIRST(&card->streams));
} }
card->pstream = NULL;
card->rstream = NULL;
return B_OK; return B_OK;
} }
src/add-ons/kernel/drivers/audio/ac97/auvia/multi.c
+7 -4
View File
@@ -381,7 +381,7 @@ auvia_create_controls_list(multi_dev *multi)
} }
multi->control_count = index; multi->control_count = index;
PRINT(("multi->control_count %u\n", multi->control_count)); PRINT(("multi->control_count %lu\n", multi->control_count));
return B_OK; return B_OK;
} }
@@ -393,7 +393,7 @@ auvia_get_mix(auvia_dev *card, multi_mix_value_info * MMVI)
for(i=0; i<MMVI->item_count; i++) { for(i=0; i<MMVI->item_count; i++) {
id = MMVI->values[i].id - EMU_MULTI_CONTROL_FIRSTID; id = MMVI->values[i].id - EMU_MULTI_CONTROL_FIRSTID;
if(id < 0 || id >= card->multi.control_count) { if(id < 0 || id >= card->multi.control_count) {
PRINT(("auvia_get_mix : invalid control id requested : %i\n", id)); PRINT(("auvia_get_mix : invalid control id requested : %li\n", id));
continue; continue;
} }
control = &card->multi.controls[id]; control = &card->multi.controls[id];
@@ -432,7 +432,7 @@ auvia_set_mix(auvia_dev *card, multi_mix_value_info * MMVI)
for(i=0; i<MMVI->item_count; i++) { for(i=0; i<MMVI->item_count; i++) {
id = MMVI->values[i].id - EMU_MULTI_CONTROL_FIRSTID; id = MMVI->values[i].id - EMU_MULTI_CONTROL_FIRSTID;
if(id < 0 || id >= card->multi.control_count) { if(id < 0 || id >= card->multi.control_count) {
PRINT(("auvia_set_mix : invalid control id requested : %i\n", id)); PRINT(("auvia_set_mix : invalid control id requested : %li\n", id));
continue; continue;
} }
control = &card->multi.controls[id]; control = &card->multi.controls[id];
@@ -442,7 +442,7 @@ auvia_set_mix(auvia_dev *card, multi_mix_value_info * MMVI)
if(i+1<MMVI->item_count) { if(i+1<MMVI->item_count) {
id = MMVI->values[i + 1].id - EMU_MULTI_CONTROL_FIRSTID; id = MMVI->values[i + 1].id - EMU_MULTI_CONTROL_FIRSTID;
if(id < 0 || id >= card->multi.control_count) { if(id < 0 || id >= card->multi.control_count) {
PRINT(("auvia_set_mix : invalid control id requested : %i\n", id)); PRINT(("auvia_set_mix : invalid control id requested : %li\n", id));
} else { } else {
control2 = &card->multi.controls[id]; control2 = &card->multi.controls[id];
if(control2->mix_control.master != control->mix_control.id) if(control2->mix_control.master != control->mix_control.id)
@@ -1098,6 +1098,9 @@ auvia_free(void* cookie)
while(!LIST_EMPTY(&card->streams)) { while(!LIST_EMPTY(&card->streams)) {
auvia_stream_delete(LIST_FIRST(&card->streams)); auvia_stream_delete(LIST_FIRST(&card->streams));
} }
card->pstream = NULL;
card->rstream = NULL;
return B_OK; return B_OK;
} }
src/add-ons/kernel/drivers/audio/echo/multi.cpp
+3
View File
@@ -992,6 +992,9 @@ echo_free(void* cookie)
while(!LIST_EMPTY(&card->streams)) { while(!LIST_EMPTY(&card->streams)) {
echo_stream_delete(LIST_FIRST(&card->streams)); echo_stream_delete(LIST_FIRST(&card->streams));
} }
card->pstream = NULL;
card->rstream = NULL;
return B_OK; return B_OK;
} }
src/add-ons/kernel/drivers/audio/emuxki/multi.c
+5
View File
@@ -1262,6 +1262,11 @@ emuxki_free(void* cookie)
while(!LIST_EMPTY(&card->streams)) { while(!LIST_EMPTY(&card->streams)) {
emuxki_stream_delete(LIST_FIRST(&card->streams)); emuxki_stream_delete(LIST_FIRST(&card->streams));
} }
card->pstream = NULL;
card->pstream2 = NULL;
card->rstream = NULL;
card->rstream2 = NULL;
return B_OK; return B_OK;
} }