Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
audio
/
noaudio.c
diff --git
a/qemu/audio/noaudio.c
b/qemu/audio/noaudio.c
index
50db1f3
..
b360c19
100644
(file)
--- a/
qemu/audio/noaudio.c
+++ b/
qemu/audio/noaudio.c
@@
-21,6
+21,7
@@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "audio.h"
#include "qemu/timer.h"
#include "qemu-common.h"
#include "audio.h"
#include "qemu/timer.h"
@@
-48,8
+49,8
@@
static int no_run_out (HWVoiceOut *hw, int live)
now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
ticks = now - no->old_ticks;
now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
ticks = now - no->old_ticks;
- bytes = muldiv64
(ticks, hw->info.bytes_per_second, get_ticks_per_sec ()
);
- bytes = audio_MIN
(bytes, INT_MAX);
+ bytes = muldiv64
(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND
);
+ bytes = audio_MIN(bytes, INT_MAX);
samples = bytes >> hw->info.shift;
no->old_ticks = now;
samples = bytes >> hw->info.shift;
no->old_ticks = now;
@@
-60,7
+61,7
@@
static int no_run_out (HWVoiceOut *hw, int live)
static int no_write (SWVoiceOut *sw, void *buf, int len)
{
static int no_write (SWVoiceOut *sw, void *buf, int len)
{
- return audio_pcm_sw_write
(sw, buf, len);
+ return audio_pcm_sw_write(sw, buf, len);
}
static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)
}
static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)
@@
-105,7
+106,7
@@
static int no_run_in (HWVoiceIn *hw)
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
int64_t ticks = now - no->old_ticks;
int64_t bytes =
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
int64_t ticks = now - no->old_ticks;
int64_t bytes =
- muldiv64
(ticks, hw->info.bytes_per_second, get_ticks_per_sec ()
);
+ muldiv64
(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND
);
no->old_ticks = now;
bytes = audio_MIN (bytes, INT_MAX);
no->old_ticks = now;
bytes = audio_MIN (bytes, INT_MAX);