forked from pool/alsa-utils
Takashi Iwai
141a404e6c
- Backport alsa-utils fixes from upstream: 0001-alsamixer-fix-display-of-active-inactive-controls.patch 0002-alsaloop-libsamplerate-requires-specific-formats-for.patch 0003-alsaloop-another-try-to-force-correct-formats-for-li.patch 0004-alsamixer-fix-build-on-uClibc.patch 0005-alsactl-init-Mute-CD-Playback-volume-by-default.patch 0006-Revert-alsactl-Display-help-for-names-command.patch 0007-alsaucm-Add-list1-command-for-non-tuple-lists.patch 0008-alsaucm-Don-t-double-free-empty-lists.patch 0009-aplay-Add-i-option-for-interactive-mode.patch 0010-aplay-Avoid-recursive-signal-handling.patch 0012-alsaloop-Use-AM_CFLAGS-in-Makefile.am.patch 0013-Updated-COPYING-with-the-recent-FSF-address.patch 0014-alsamixer-Fix-64bit-issues.patch 0015-aplay-Add-include-files-for-mkdir.patch 0016-aplay-Use-standard-endian-convesions.patch OBS-URL: https://build.opensuse.org/request/show/72632 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=33
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 3bea722b3bfdbec2e26218aca66e55b019a24436 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Fri, 3 Jun 2011 14:28:28 +0200
|
|
Subject: [PATCH 14/16] alsamixer: Fix 64bit issues
|
|
|
|
lrint() returns a long int.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsamixer/mixer_display.c | 6 +++---
|
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/alsamixer/mixer_display.c b/alsamixer/mixer_display.c
|
|
index 51a1546..8ba396a 100644
|
|
--- a/alsamixer/mixer_display.c
|
|
+++ b/alsamixer/mixer_display.c
|
|
@@ -486,17 +486,17 @@ static void display_control(unsigned int control_index)
|
|
if (control->flags & IS_ACTIVE)
|
|
wattrset(mixer_widget.window, attr_mixer_active);
|
|
if (!(control->flags & HAS_VOLUME_1)) {
|
|
- sprintf(buf, "%d", lrint(volumes[0] * 100));
|
|
+ sprintf(buf, "%d", (int)lrint(volumes[0] * 100));
|
|
display_string_in_field(values_y, frame_left - 2, buf, 8, ALIGN_CENTER);
|
|
} else {
|
|
mvwprintw(mixer_widget.window, values_y, frame_left - 2,
|
|
- "%3d", lrint(volumes[0] * 100));
|
|
+ "%3d", (int)lrint(volumes[0] * 100));
|
|
if (control->flags & IS_ACTIVE)
|
|
wattrset(mixer_widget.window, attr_ctl_frame);
|
|
waddstr(mixer_widget.window, "<>");
|
|
if (control->flags & IS_ACTIVE)
|
|
wattrset(mixer_widget.window, attr_mixer_active);
|
|
- wprintw(mixer_widget.window, "%-3d", lrint(volumes[1] * 100));
|
|
+ wprintw(mixer_widget.window, "%-3d", (int)lrint(volumes[1] * 100));
|
|
}
|
|
}
|
|
|
|
--
|
|
1.7.5.3
|
|
|