Commit b41cffbeb4220dec30f512dc9e22cf5adfa3d49f

Authored by bellard
1 parent 0bd48850

debug msg (malc)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1615 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 8 additions and 5 deletions
audio/ossaudio.c
@@ -506,8 +506,11 @@ static int oss_init_out (HWVoiceOut *hw, audsettings_t *as) @@ -506,8 +506,11 @@ static int oss_init_out (HWVoiceOut *hw, audsettings_t *as)
506 1 << hw->info.shift 506 1 << hw->info.shift
507 ); 507 );
508 if (!oss->pcm_buf) { 508 if (!oss->pcm_buf) {
509 - dolog ("Could not allocate DAC buffer (%d bytes)\n",  
510 - hw->samples << hw->info.shift); 509 + dolog (
  510 + "Could not allocate DAC buffer (%d samples, each %d bytes)\n",
  511 + hw->samples,
  512 + 1 << hw->info.shift
  513 + );
511 oss_anal_close (&fd); 514 oss_anal_close (&fd);
512 return -1; 515 return -1;
513 } 516 }
@@ -597,8 +600,8 @@ static int oss_init_in (HWVoiceIn *hw, audsettings_t *as) @@ -597,8 +600,8 @@ static int oss_init_in (HWVoiceIn *hw, audsettings_t *as)
597 hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift; 600 hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift;
598 oss->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); 601 oss->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift);
599 if (!oss->pcm_buf) { 602 if (!oss->pcm_buf) {
600 - dolog ("Could not allocate ADC buffer (%d bytes)\n",  
601 - hw->samples << hw->info.shift); 603 + dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\n",
  604 + hw->samples, 1 << hw->info.shift);
602 oss_anal_close (&fd); 605 oss_anal_close (&fd);
603 return -1; 606 return -1;
604 } 607 }
@@ -657,7 +660,7 @@ static int oss_run_in (HWVoiceIn *hw) @@ -657,7 +660,7 @@ static int oss_run_in (HWVoiceIn *hw)
657 660
658 if (nread > 0) { 661 if (nread > 0) {
659 if (nread & hw->info.align) { 662 if (nread & hw->info.align) {
660 - dolog ("warning: Misaligned read %d (requested %d), " 663 + dolog ("warning: Misaligned read %zd (requested %d), "
661 "alignment %d\n", nread, bufs[i].add << hwshift, 664 "alignment %d\n", nread, bufs[i].add << hwshift,
662 hw->info.align + 1); 665 hw->info.align + 1);
663 } 666 }