Mailinglist Archive: opensuse-commit (1945 mails)
| < Previous | Next > |
commit alsa-utils
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 03 Nov 2008 11:54:27 +0100
- Message-id: <20081103105427.9D95D678161@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package alsa-utils
checked in at Mon Nov 3 11:54:27 CET 2008.
--------
--- alsa-utils/alsa-utils.changes 2008-10-23 16:32:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa-utils/alsa-utils.changes 2008-10-29
14:32:59.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Oct 29 14:32:47 CET 2008 - tiwai@xxxxxxx
+
+- updated to version 1.0.18-final;
+ just including all previous fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
alsa-utils-1.0.18rc3-package-fix.diff
alsa-utils-1.0.18rc3.tar.bz2
alsa-utils-git-fixes.diff
New:
----
alsa-utils-1.0.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-utils.spec ++++++
--- /var/tmp/diff_new_pack.U13544/_old 2008-11-03 11:54:15.000000000 +0100
+++ /var/tmp/diff_new_pack.U13544/_new 2008-11-03 11:54:15.000000000 +0100
@@ -20,7 +20,7 @@
Name: alsa-utils
BuildRequires: alsa-devel ncurses-devel xmlto
-%define package_version 1.0.18rc3
+%define package_version 1.0.18
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Players
Provides: alsa-conf
@@ -28,10 +28,10 @@
AutoReqProv: on
Summary: Advanced Linux Sound Architecture Utilities
Version: 1.0.18
-Release: 4
+Release: 5
Source:
ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
-Patch: alsa-utils-git-fixes.diff
-Patch1: alsa-utils-%{package_version}-package-fix.diff
+# Patch: alsa-utils-git-fixes.diff
+# Patch1: alsa-utils-%{package_version}-package-fix.diff
Url: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,8 +48,8 @@
%prep
%setup -q -n %{name}-%{package_version}
-%patch1 -p1
-%patch -p1
+# %patch1 -p1
+# %patch -p1
mv alsamixer/README alsamixer/README-alsamixer
%build
@@ -78,6 +78,9 @@
%{_datadir}/alsa
%changelog
+* Wed Oct 29 2008 tiwai@xxxxxxx
+- updated to version 1.0.18-final;
+ just including all previous fixes
* Thu Oct 23 2008 tiwai@xxxxxxx
- added --test-position in aplay/arecord for debugging
- can disable the build of alsaconf in configure
++++++ alsa-utils-1.0.18rc3.tar.bz2 -> alsa-utils-1.0.18.tar.bz2 ++++++
++++ 1776 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/alsactl/alsactl.1
new/alsa-utils-1.0.18/alsactl/alsactl.1
--- old/alsa-utils-1.0.18rc3/alsactl/alsactl.1 2008-09-09 18:55:50.000000000
+0200
+++ new/alsa-utils-1.0.18/alsactl/alsactl.1 2008-10-29 13:42:11.000000000
+0100
@@ -51,6 +51,11 @@
as much as possible. This option is set as default now.
.TP
+\fI\-g, \-\-ignore\fP
+Used with store and restore commands. Do not show 'No soundcards found'
+and do not set an error exit code when soundcards are not installed.
+
+.TP
\fI\-P, \-\-pedantic\fP
Used with restore command. Don't restore mismatching control elements.
This option was the old default behavior.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/alsactl/alsactl.c
new/alsa-utils-1.0.18/alsactl/alsactl.c
--- old/alsa-utils-1.0.18rc3/alsactl/alsactl.c 2008-09-09 18:55:50.000000000
+0200
+++ new/alsa-utils-1.0.18/alsactl/alsactl.c 2008-10-29 13:42:11.000000000
+0100
@@ -34,6 +34,7 @@
int debugflag = 0;
int force_restore = 1;
+int ignore_nocards = 0;
char *command;
char *statefile = NULL;
@@ -48,7 +49,8 @@
printf(" -f,--file # configuration file (default " SYS_ASOUNDRC
")\n");
printf(" -F,--force try to restore the matching controls as much
as possible\n");
printf(" (default mode)\n");
- printf(" -P,--pedantic don't restore mismatching controls (old
default)\n");
+ printf(" -g,--ignore ignore 'No soundcards found' error\n");
+ printf(" -P,--pedantic do not restore mismatching controls (old
default)\n");
printf(" -r,--runstate # save restore and init state to this file
(only errors)\n");
printf(" default settings is 'no file set'\n");
printf(" -R,--remove remove runstate file at first, otherwise
append errors\n");
@@ -75,6 +77,7 @@
{"env", 1, NULL, 'E'},
{"initfile", 1, NULL, 'i'},
{"force", 0, NULL, 'F'},
+ {"ignore", 0, NULL, 'g'},
{"pedantic", 0, NULL, 'P'},
{"runstate", 0, NULL, 'r'},
{"remove", 0, NULL, 'R'},
@@ -99,7 +102,7 @@
while (1) {
int c;
- if ((c = getopt_long(argc, argv, "hdvf:FE:i:Pr:R", long_option,
NULL)) < 0)
+ if ((c = getopt_long(argc, argv, "hdvf:FgE:i:Pr:R",
long_option, NULL)) < 0)
break;
switch (c) {
case 'h':
@@ -111,6 +114,9 @@
case 'F':
force_restore = 1;
break;
+ case 'g':
+ ignore_nocards = 1;
+ break;
case 'E':
if (putenv(optarg)) {
fprintf(stderr, "environment string '%s' is
wrong\n", optarg);
@@ -150,7 +156,7 @@
}
cardname = argc - optind > 1 ? argv[optind + 1] : NULL;
- for (tmp = devfiles; cardname != NULL && tmp != NULL; tmp++) {
+ for (tmp = devfiles; cardname != NULL && *tmp != NULL; tmp++) {
int len = strlen(*tmp);
if (!strncmp(cardname, *tmp, len)) {
long l = strtol(cardname + len, NULL, 0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/alsactl/alsactl.h
new/alsa-utils-1.0.18/alsactl/alsactl.h
--- old/alsa-utils-1.0.18rc3/alsactl/alsactl.h 2008-09-09 18:55:50.000000000
+0200
+++ new/alsa-utils-1.0.18/alsactl/alsactl.h 2008-10-29 13:42:11.000000000
+0100
@@ -1,5 +1,6 @@
extern int debugflag;
extern int force_restore;
+extern int ignore_nocards;
extern char *command;
extern char *statefile;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/alsactl/state.c new/alsa-utils-1.0.18/alsactl/state.c
--- old/alsa-utils-1.0.18rc3/alsactl/state.c 2008-09-09 18:55:50.000000000
+0200
+++ new/alsa-utils-1.0.18/alsactl/state.c 2008-10-29 13:42:11.000000000
+0100
@@ -1507,8 +1507,12 @@
break;
if (card < 0) {
if (first) {
- error("No soundcards found...");
- return -ENODEV;
+ if (ignore_nocards) {
+ return 0;
+ } else {
+ error("No soundcards found...");
+ return -ENODEV;
+ }
}
break;
}
@@ -1606,8 +1610,12 @@
break;
if (card < 0) {
if (first) {
- error("No soundcards found...");
- return -ENODEV;
+ if (ignore_nocards) {
+ return 0;
+ } else {
+ error("No soundcards found...");
+ return -ENODEV;
+ }
}
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/aplay/aplay.c new/alsa-utils-1.0.18/aplay/aplay.c
--- old/alsa-utils-1.0.18rc3/aplay/aplay.c 2008-09-09 18:55:50.000000000
+0200
+++ new/alsa-utils-1.0.18/aplay/aplay.c 2008-10-29 13:42:11.000000000 +0100
@@ -106,6 +106,7 @@
static int buffer_pos = 0;
static size_t bits_per_sample, bits_per_frame;
static size_t chunk_bytes;
+static int test_position = 0;
static snd_output_t *log;
static int fd = -1;
@@ -186,7 +187,8 @@
" --disable-resample disable automatic rate resample\n"
" --disable-channels disable automatic channel conversions\n"
" --disable-format disable automatic format conversions\n"
-" --disable-softvol disable software volume control (softvol)\n")
+" --disable-softvol disable software volume control (softvol)\n"
+" --test-position test ring buffer position\n")
, command);
printf(_("Recognized sample formats are:"));
for (k = 0; k < SND_PCM_FORMAT_LAST; ++k) {
@@ -347,7 +349,8 @@
OPT_DISABLE_RESAMPLE,
OPT_DISABLE_CHANNELS,
OPT_DISABLE_FORMAT,
- OPT_DISABLE_SOFTVOL
+ OPT_DISABLE_SOFTVOL,
+ OPT_TEST_POSITION
};
int main(int argc, char *argv[])
@@ -385,6 +388,7 @@
{"disable-channels", 0, 0, OPT_DISABLE_CHANNELS},
{"disable-format", 0, 0, OPT_DISABLE_FORMAT},
{"disable-softvol", 0, 0, OPT_DISABLE_SOFTVOL},
+ {"test-position", 0, 0, OPT_TEST_POSITION},
{0, 0, 0, 0}
};
char *pcm_name = "default";
@@ -563,6 +567,9 @@
case OPT_DISABLE_SOFTVOL:
open_mode |= SND_PCM_NO_SOFTVOL;
break;
+ case OPT_TEST_POSITION:
+ test_position = 1;
+ break;
default:
fprintf(stderr, _("Try `%s --help' for more
information.\n"), command);
return 1;
@@ -1089,6 +1096,8 @@
/* not required, but for sure */
snd_pcm_mmap_commit(handle, offset, 0);
}
+
+ buffer_frames = buffer_size; /* for position test */
}
#ifndef timersub
@@ -1385,6 +1394,25 @@
}
}
+static void do_test_position(void)
+{
+ static int counter = 0;
+ snd_pcm_sframes_t avail, delay;
+ int err;
+
+ err = snd_pcm_avail_delay(handle, &avail, &delay);
+ if (err < 0)
+ return;
+ if (avail > 4 * (snd_pcm_sframes_t)buffer_frames ||
+ avail < -4 * (snd_pcm_sframes_t)buffer_frames ||
+ delay > 4 * (snd_pcm_sframes_t)buffer_frames ||
+ delay < -4 * (snd_pcm_sframes_t)buffer_frames) {
+ fprintf(stderr, "Suspicious buffer position (%i total): avail = %li,
delay = %li, buffer = %li\n", ++counter, (long)avail, (long)delay,
(long)buffer_frames);
+ } else if (verbose) {
+ fprintf(stderr, "Buffer position: %li/%li (%li)\n", (long)avail,
(long)delay, (long)buffer_frames);
+ }
+}
+
/*
* write function
*/
@@ -1399,7 +1427,11 @@
count = chunk_size;
}
while (count > 0) {
+ if (test_position)
+ do_test_position();
r = writei_func(handle, data, count);
+ if (test_position)
+ do_test_position();
if (r == -EAGAIN || (r >= 0 && (size_t)r < count)) {
snd_pcm_wait(handle, 1000);
} else if (r == -EPIPE) {
@@ -1440,7 +1472,11 @@
size_t offset = result;
for (channel = 0; channel < channels; channel++)
bufs[channel] = data[channel] + offset *
bits_per_sample / 8;
+ if (test_position)
+ do_test_position();
r = writen_func(handle, bufs, count);
+ if (test_position)
+ do_test_position();
if (r == -EAGAIN || (r >= 0 && (size_t)r < count)) {
snd_pcm_wait(handle, 1000);
} else if (r == -EPIPE) {
@@ -1478,7 +1514,11 @@
}
while (count > 0) {
+ if (test_position)
+ do_test_position();
r = readi_func(handle, data, count);
+ if (test_position)
+ do_test_position();
if (r == -EAGAIN || (r >= 0 && (size_t)r < count)) {
snd_pcm_wait(handle, 1000);
} else if (r == -EPIPE) {
@@ -1516,7 +1556,11 @@
size_t offset = result;
for (channel = 0; channel < channels; channel++)
bufs[channel] = data[channel] + offset *
bits_per_sample / 8;
+ if (test_position)
+ do_test_position();
r = readn_func(handle, bufs, count);
+ if (test_position)
+ do_test_position();
if (r == -EAGAIN || (r >= 0 && (size_t)r < count)) {
snd_pcm_wait(handle, 1000);
} else if (r == -EPIPE) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/configure.in new/alsa-utils-1.0.18/configure.in
--- old/alsa-utils-1.0.18rc3/configure.in 2008-09-09 19:50:29.000000000
+0200
+++ new/alsa-utils-1.0.18/configure.in 2008-10-29 13:48:01.000000000 +0100
@@ -2,7 +2,7 @@
AC_PREREQ(2.59)
AC_INIT(alsamixer/alsamixer.c)
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.18rc3)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.18)
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.15])
@@ -29,6 +29,7 @@
AC_PROG_LN_S
AM_PATH_ALSA(1.0.16)
+dnl Disable alsamixer
CURSESINC=""
CURSESLIB=""
CURSES_CFLAGS=""
@@ -41,6 +42,16 @@
esac],[alsamixer=true])
AM_CONDITIONAL(ALSAMIXER, test x$alsamixer = xtrue)
+dnl Disable alsaconf
+AC_ARG_ENABLE(alsaconf,
+ [ --disable-alsaconf Disable alsaconf packaging],
+ [case "${enableval}" in
+ yes) alsaconf=true ;;
+ no) alsaconf=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-alsaconf) ;;
+ esac],[alsaconf=true])
+AM_CONDITIONAL(ALSACONF, test x$alsaconf = xtrue)
+
dnl Checks for header files.
AC_HEADER_STDC
if test x$alsamixer = xtrue; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/iecset/iecset.c new/alsa-utils-1.0.18/iecset/iecset.c
--- old/alsa-utils-1.0.18rc3/iecset/iecset.c 2008-09-09 18:55:50.000000000
+0200
+++ new/alsa-utils-1.0.18/iecset/iecset.c 2008-10-29 13:42:11.000000000
+0100
@@ -90,6 +90,7 @@
printf("Options:\n");
printf(" -D device specifies the control device to use\n");
printf(" -c card specifies the card number to use (equiv. with
-Dhw:#)\n");
+ printf(" -n number specifies the control index number (default =
0)\n");
printf(" -x dump the dump the AESx hex code for IEC958 PCM
parameters\n");
printf(" -i read commands from stdin\n");
printf("Commands:\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/include/version.h
new/alsa-utils-1.0.18/include/version.h
--- old/alsa-utils-1.0.18rc3/include/version.h 2008-09-09 19:50:39.000000000
+0200
+++ new/alsa-utils-1.0.18/include/version.h 2008-10-29 13:48:10.000000000
+0100
@@ -4,9 +4,9 @@
#define SND_UTIL_MAJOR 1
#define SND_UTIL_MINOR 0
-#define SND_UTIL_SUBMINOR 18rc3
+#define SND_UTIL_SUBMINOR 18
#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\
(SND_UTIL_MINOR<<8)|\
SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR "1.0.18rc3"
+#define SND_UTIL_VERSION_STR "1.0.18"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/Makefile.am new/alsa-utils-1.0.18/Makefile.am
--- old/alsa-utils-1.0.18rc3/Makefile.am 2008-09-09 19:50:28.000000000
+0200
+++ new/alsa-utils-1.0.18/Makefile.am 2008-10-29 13:48:00.000000000 +0100
@@ -4,7 +4,13 @@
else
ALSAMIXER_DIR=
endif
-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset
seq speaker-test utils m4 po
+if ALSACONF
+ALSACONF_DIR=alsaconf
+else
+ALSACONF_DIR=
+endif
+SUBDIRS= include alsactl $(ALSACONF_DIR) $(ALSAMIXER_DIR) amidi amixer \
+ aplay iecset seq speaker-test utils m4 po
EXTRA_DIST= config.rpath TODO gitcompile
AUTOMAKE_OPTIONS=foreign
ACLOCAL_AMFLAGS = -I m4
Files old/alsa-utils-1.0.18rc3/po/ja.gmo and new/alsa-utils-1.0.18/po/ja.gmo
differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/alsa-utils-1.0.18rc3/po/ja.po new/alsa-utils-1.0.18/po/ja.po
--- old/alsa-utils-1.0.18rc3/po/ja.po 2008-09-09 19:50:48.000000000 +0200
+++ new/alsa-utils-1.0.18/po/ja.po 2008-10-29 13:48:20.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: alsa-utils 1.0.9a\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-09 19:50+0200\n"
+"POT-Creation-Date: 2008-10-29 13:48+0100\n"
"PO-Revision-Date: 2006-04-18 15:51+0200\n"
"Last-Translator: Takashi Iwai <tiwai@xxxxxxx>\n"
"Language-Team: Japanese\n"
@@ -17,23 +17,23 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: aplay/aplay.c:135
+#: aplay/aplay.c:136
msgid "raw data"
msgstr "raw データ"
-#: aplay/aplay.c:136
+#: aplay/aplay.c:137
msgid "VOC"
msgstr "VOC"
-#: aplay/aplay.c:138
+#: aplay/aplay.c:139
msgid "WAVE"
msgstr "WAVE"
-#: aplay/aplay.c:139
+#: aplay/aplay.c:140
msgid "Sparc Audio"
msgstr "Sparc オーディオ"
-#: aplay/aplay.c:160
+#: aplay/aplay.c:161
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -67,6 +67,7 @@
" --disable-channels disable automatic channel conversions\n"
" --disable-format disable automatic format conversions\n"
" --disable-softvol disable software volume control (softvol)\n"
+" --test-position test ring buffer position\n"
msgstr ""
"使用法: %s [オプション]... [ファイル]...\n"
"\n"
@@ -95,12 +96,12 @@
"-v, --verbose PCM の設定を表示 (複数指定可能)\n"
"-I, --separate-channels 各チャネルに一つのファイルを用いる\n"
-#: aplay/aplay.c:191 speaker-test/speaker-test.c:784
+#: aplay/aplay.c:193 speaker-test/speaker-test.c:784
#, c-format
msgid "Recognized sample formats are:"
msgstr "認識されるサンプルフォーマット:"
-#: aplay/aplay.c:197
+#: aplay/aplay.c:199
#, c-format
msgid ""
"\n"
@@ -109,154 +110,154 @@
"\n"
"これらのいくつかは指定のハードウェアで使用不可能な場合があります\n"
-#: aplay/aplay.c:198
+#: aplay/aplay.c:200
#, c-format
msgid "The availabled format shortcuts are:\n"
msgstr "可能なフォーマットの省略形:\n"
-#: aplay/aplay.c:199
+#: aplay/aplay.c:201
#, c-format
msgid "-f cd (16 bit little endian, 44100, stereo)\n"
msgstr "-f cd (16 ビット、リトルエンディアン、44100、ステレオ)\n"
-#: aplay/aplay.c:200
+#: aplay/aplay.c:202
#, c-format
msgid "-f cdr (16 bit big endian, 44100, stereo)\n"
msgstr "-f cdr (16 ビット、ビッグエンディアン、44100、ステレオ)\n"
-#: aplay/aplay.c:201
+#: aplay/aplay.c:203
#, c-format
msgid "-f dat (16 bit little endian, 48000, stereo)\n"
msgstr "-f dat (16 ビット、リトルエンディアン、48000、ステレオ)\n"
-#: aplay/aplay.c:215
+#: aplay/aplay.c:217
msgid "no soundcards found..."
msgstr "サウンドカードが見つかりません..."
-#: aplay/aplay.c:218
+#: aplay/aplay.c:220
#, c-format
msgid "**** List of %s Hardware Devices ****\n"
msgstr "**** ハードウェアデバイス %s のリスト ****\n"
-#: aplay/aplay.c:247
+#: aplay/aplay.c:249
#, c-format
msgid "card %i: %s [%s], device %i: %s [%s]\n"
msgstr "カード %i: %s [%s], デバイス %i: %s [%s]\n"
-#: aplay/aplay.c:253
+#: aplay/aplay.c:255
#, c-format
msgid " Subdevices: %i/%i\n"
msgstr " サブデバイス: %i/%i\n"
-#: aplay/aplay.c:260
+#: aplay/aplay.c:262
#, c-format
msgid " Subdevice #%i: %s\n"
msgstr " サブデバイス #%i: %s\n"
-#: aplay/aplay.c:324
+#: aplay/aplay.c:326
#, c-format
msgid "Aborted by signal %s...\n"
msgstr "シグナル %s で中断...\n"
-#: aplay/aplay.c:416
+#: aplay/aplay.c:420
msgid "command should be named either arecord or aplay"
msgstr "arecord または aplay コマンドのみ可能"
-#: aplay/aplay.c:455
+#: aplay/aplay.c:459
#, c-format
msgid "unrecognized file format %s"
msgstr "不正なファイルフォーマット %s"
-#: aplay/aplay.c:462
+#: aplay/aplay.c:466
#, c-format
msgid "value %i for channels is invalid"
msgstr "不正なチャネル数 %i"
-#: aplay/aplay.c:481
+#: aplay/aplay.c:485
#, c-format
msgid "wrong extended format '%s'"
msgstr "不正な拡張フォーマット '%s'"
-#: aplay/aplay.c:492
+#: aplay/aplay.c:496
#, c-format
msgid "bad speed value %i"
msgstr "不正なレート値 %i"
-#: aplay/aplay.c:567
+#: aplay/aplay.c:574
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "より詳しい情報は「%s --help」を実行してください\n"
-#: aplay/aplay.c:583
+#: aplay/aplay.c:590
#, c-format
msgid "audio open error: %s"
msgstr ""
-#: aplay/aplay.c:588
+#: aplay/aplay.c:595
#, c-format
msgid "info error: %s"
msgstr ""
-#: aplay/aplay.c:595
+#: aplay/aplay.c:602
#, c-format
msgid "nonblock setting error: %s"
msgstr ""
-#: aplay/aplay.c:605 aplay/aplay.c:712 aplay/aplay.c:1066
+#: aplay/aplay.c:612 aplay/aplay.c:719 aplay/aplay.c:1073
msgid "not enough memory"
msgstr "メモリが足りません"
-#: aplay/aplay.c:702
+#: aplay/aplay.c:709
#, c-format
msgid "read error (called from line %i)"
msgstr "リードエラー (%i 行)"
-#: aplay/aplay.c:760
+#: aplay/aplay.c:767
#, c-format
msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)"
msgstr ""
-#: aplay/aplay.c:770
+#: aplay/aplay.c:777
#, c-format
msgid ""
"unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"
msgstr ""
-#: aplay/aplay.c:775
+#: aplay/aplay.c:782
msgid "wrong format tag in extensible 'fmt ' chunk"
msgstr ""
-#: aplay/aplay.c:782
+#: aplay/aplay.c:789
#, c-format
msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"
msgstr ""
-#: aplay/aplay.c:786
+#: aplay/aplay.c:793
#, c-format
msgid "can't play WAVE-files with %d tracks"
msgstr "%d トラックを含む WAVE ファイルは再生できません"
-#: aplay/aplay.c:794 aplay/aplay.c:894
+#: aplay/aplay.c:801 aplay/aplay.c:901
#, c-format
msgid "Warning: format is changed to U8\n"
msgstr "警告: フォーマットは U8 に変更されます\n"
-#: aplay/aplay.c:800
+#: aplay/aplay.c:807
#, c-format
msgid "Warning: format is changed to S16_LE\n"
msgstr "警告: フォーマットは S16_LE に変更されます\n"
-#: aplay/aplay.c:808
+#: aplay/aplay.c:815
#, c-format
msgid "Warning: format is changed to S24_3LE\n"
msgstr "警告: フォーマットは S24_3LE に変更されます\n"
-#: aplay/aplay.c:814
+#: aplay/aplay.c:821
#, c-format
msgid "Warning: format is changed to S24_LE\n"
msgstr "警告: フォーマットは S24_LE に変更されます\n"
-#: aplay/aplay.c:818
+#: aplay/aplay.c:825
#, c-format
msgid ""
" can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"
@@ -264,254 +265,254 @@
"%2$d バイト長 %1$d サンプルビット (%3$d チャネル) の WAVE ファイルは再生でき"
"ません"
-#: aplay/aplay.c:830
+#: aplay/aplay.c:837
#, c-format
msgid " can't play WAVE-files with sample %d bits wide"
msgstr "%d ビット長のサンプルの WAVE ファイルは再生できません"
-#: aplay/aplay.c:888
+#: aplay/aplay.c:895
#, c-format
msgid "Warning: format is changed to MU_LAW\n"
msgstr "警告: フォーマットは MU_LAW に変更されます\n"
-#: aplay/aplay.c:900
+#: aplay/aplay.c:907
#, c-format
msgid "Warning: format is changed to S16_BE\n"
msgstr "警告: フォーマットは S16_BE に変更されます\n"
-#: aplay/aplay.c:913 aplay/aplay.c:1635 aplay/aplay.c:1642 aplay/aplay.c:2164
-#: aplay/aplay.c:2176
+#: aplay/aplay.c:920 aplay/aplay.c:1679 aplay/aplay.c:1686 aplay/aplay.c:2208
+#: aplay/aplay.c:2220
msgid "read error"
msgstr "リードエラー"
-#: aplay/aplay.c:932
+#: aplay/aplay.c:939
msgid "Broken configuration for this PCM: no configurations available"
msgstr "指定の PCM を使用できません: 設定がありません"
-#: aplay/aplay.c:949
+#: aplay/aplay.c:956
msgid "Access type not available"
msgstr "アクセスタイプが使用不可能"
-#: aplay/aplay.c:954
+#: aplay/aplay.c:961
msgid "Sample format non available"
msgstr "サンプルフォーマットが使用不可能"
-#: aplay/aplay.c:959
+#: aplay/aplay.c:966
msgid "Channels count non available"
msgstr "チャネル数が使用不可能"
-#: aplay/aplay.c:974
+#: aplay/aplay.c:981
#, c-format
msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n"
msgstr "警告: レートが不正確です (要求値 = %iHz, 使用値 = %iHz)\n"
-#: aplay/aplay.c:980
+#: aplay/aplay.c:987
#, c-format
msgid " please, try the plug plugin %s\n"
msgstr " plug プラグイン%s を使用してください\n"
-#: aplay/aplay.c:1015
+#: aplay/aplay.c:1022
msgid "Unable to install hw params:"
msgstr "hw params のインストールに失敗しました:"
-#: aplay/aplay.c:1022
+#: aplay/aplay.c:1029
#, c-format
msgid "Can't use period equal to buffer size (%lu == %lu)"
msgstr "period と buffer サイズには同じ値を使用できません (%lu == %lu)"
-#: aplay/aplay.c:1053
+#: aplay/aplay.c:1060
msgid "unable to install sw params:"
msgstr "sw params のインストールに失敗しました:"
-#: aplay/aplay.c:1114
+#: aplay/aplay.c:1123
#, c-format
msgid "status error: %s"
msgstr "ステータスエラー: %s"
-#: aplay/aplay.c:1122
+#: aplay/aplay.c:1131
#, c-format
msgid "%s!!! (at least %.3f ms long)\n"
msgstr "%s!!! (少なくとも %.3f ms)\n"
-#: aplay/aplay.c:1123
+#: aplay/aplay.c:1132
msgid "underrun"
msgstr "アンダーラン"
-#: aplay/aplay.c:1123
+#: aplay/aplay.c:1132
msgid "overrun"
msgstr "オーバーラン"
-#: aplay/aplay.c:1126
+#: aplay/aplay.c:1135
#, c-format
msgid "Status:\n"
msgstr "ステータス:\n"
-#: aplay/aplay.c:1130
+#: aplay/aplay.c:1139
#, c-format
msgid "xrun: prepare error: %s"
msgstr ""
-#: aplay/aplay.c:1136
+#: aplay/aplay.c:1145
#, c-format
msgid "Status(DRAINING):\n"
msgstr "ステータス(DRAINING):\n"
-#: aplay/aplay.c:1140
+#: aplay/aplay.c:1149
#, c-format
msgid "capture stream format change? attempting recover...\n"
msgstr "録音ストリームのフォーマットが変更？ 修復を試みます...\n"
-#: aplay/aplay.c:1142
+#: aplay/aplay.c:1151
#, c-format
msgid "xrun(DRAINING): prepare error: %s"
msgstr ""
-#: aplay/aplay.c:1149
+#: aplay/aplay.c:1158
#, c-format
msgid "Status(R/W):\n"
msgstr "ステータス(R/W):\n"
-#: aplay/aplay.c:1152
+#: aplay/aplay.c:1161
#, c-format
msgid "read/write error, state = %s"
msgstr "読み書きエラー, ステータス = %s"
-#: aplay/aplay.c:1162
+#: aplay/aplay.c:1171
#, c-format
msgid "Suspended. Trying resume. "
msgstr "サスペンド中です。レジュームします。"
-#: aplay/aplay.c:1167
+#: aplay/aplay.c:1176
#, c-format
msgid "Failed. Restarting stream. "
msgstr "失敗しました。ストリームを再スタートします。"
-#: aplay/aplay.c:1169
+#: aplay/aplay.c:1178
#, c-format
msgid "suspend: prepare error: %s"
msgstr "サスペンド: prepare エラー: %s"
-#: aplay/aplay.c:1174
+#: aplay/aplay.c:1183
#, c-format
msgid "Done.\n"
msgstr "終了\n"
-#: aplay/aplay.c:1196
+#: aplay/aplay.c:1205
#, c-format
msgid " !clip "
msgstr ""
-#: aplay/aplay.c:1343
+#: aplay/aplay.c:1352
#, c-format
msgid "Unsupported bit size %d.\n"
msgstr ""
-#: aplay/aplay.c:1377
+#: aplay/aplay.c:1386
#, c-format
msgid "Max peak (%li samples): 0x%08x "
msgstr "最大ピーク (%li サンプル): 0x%08x "
-#: aplay/aplay.c:1410
+#: aplay/aplay.c:1442
#, c-format
msgid "write error: %s"
msgstr "書込エラー: %s"
-#: aplay/aplay.c:1451
+#: aplay/aplay.c:1487
#, c-format
msgid "writev error: %s"
msgstr "書込(writev)エラー: %s"
-#: aplay/aplay.c:1489
+#: aplay/aplay.c:1529
#, c-format
msgid "read error: %s"
msgstr "読込エラー: %s"
-#: aplay/aplay.c:1527
+#: aplay/aplay.c:1571
#, c-format
msgid "readv error: %s"
msgstr "読込(readv)エラー: %s"
-#: aplay/aplay.c:1575
+#: aplay/aplay.c:1619
msgid "can't allocate buffer for silence"
msgstr "サイレンス用のバッファの取得に失敗しました"
-#: aplay/aplay.c:1584 aplay/aplay.c:1810 aplay/aplay.c:1815 aplay/aplay.c:1862
-#: aplay/aplay.c:1871 aplay/aplay.c:1878 aplay/aplay.c:1888 aplay/aplay.c:1894
-#: aplay/aplay.c:1966 aplay/aplay.c:1996 aplay/aplay.c:2010
+#: aplay/aplay.c:1628 aplay/aplay.c:1854 aplay/aplay.c:1859 aplay/aplay.c:1906
+#: aplay/aplay.c:1915 aplay/aplay.c:1922 aplay/aplay.c:1932 aplay/aplay.c:1938
+#: aplay/aplay.c:2010 aplay/aplay.c:2040 aplay/aplay.c:2054
msgid "write error"
msgstr "書込エラー"
-#: aplay/aplay.c:1597
+#: aplay/aplay.c:1641
#, c-format
msgid "voc_pcm_flush - silence error"
msgstr ""
-#: aplay/aplay.c:1600
+#: aplay/aplay.c:1644
msgid "voc_pcm_flush error"
msgstr ""
-#: aplay/aplay.c:1626
+#: aplay/aplay.c:1670
msgid "malloc error"
msgstr "malloc エラー"
-#: aplay/aplay.c:1630
+#: aplay/aplay.c:1674
#, c-format
msgid "Playing Creative Labs Channel file '%s'...\n"
msgstr "Creative Labs Channel ファイル '%s' を演奏中...\n"
-#: aplay/aplay.c:1698 aplay/aplay.c:1790
+#: aplay/aplay.c:1742 aplay/aplay.c:1834
msgid "can't play packed .voc files"
msgstr "packed .voc ファイルは演奏できません"
-#: aplay/aplay.c:1750
+#: aplay/aplay.c:1794
#, c-format
msgid "can't play loops; %s isn't seekable\n"
msgstr "ループ演奏できません。%s はシーク不可能です\n"
-#: aplay/aplay.c:1799
+#: aplay/aplay.c:1843
#, c-format
msgid "unknown blocktype %d. terminate."
msgstr "未知のブロックタイプ %d: 終了します。"
-#: aplay/aplay.c:1930
+#: aplay/aplay.c:1974
#, c-format
msgid "Wave doesn't support %s format..."
msgstr "WAVE は %s フォーマットをサポートしません..."
-#: aplay/aplay.c:1990
+#: aplay/aplay.c:2034
#, c-format
msgid "Sparc Audio doesn't support %s format..."
msgstr "Sparc オーディオは %s フォーマットをサポートしません..."
-#: aplay/aplay.c:2071
+#: aplay/aplay.c:2115
msgid "Playing"
msgstr "再生中"
-#: aplay/aplay.c:2071
+#: aplay/aplay.c:2115
msgid "Recording"
msgstr "録音中"
-#: aplay/aplay.c:2075
+#: aplay/aplay.c:2119
#, c-format
msgid "Rate %d Hz, "
msgstr "レート %d Hz, "
-#: aplay/aplay.c:2077
+#: aplay/aplay.c:2121
#, c-format
msgid "Mono"
msgstr "モノラル"
-#: aplay/aplay.c:2079
+#: aplay/aplay.c:2123
#, c-format
msgid "Stereo"
msgstr "ステレオ"
-#: aplay/aplay.c:2081
+#: aplay/aplay.c:2125
#, c-format
msgid "Channels %i"
msgstr "チャネル数 %i"
-#: aplay/aplay.c:2440 aplay/aplay.c:2493
+#: aplay/aplay.c:2484 aplay/aplay.c:2537
#, c-format
msgid "You need to specify %d files"
msgstr "%d 個のファイルを指定してください"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |