Merge from 1.1.

--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : po/libxine1.pot => po/libxine2.pot

19 files changed, 1540 insertions, 930 deletions

diff --git a/.hgtags b/.hgtags
index cb0deb191..10e6edb8d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -73,3 +73,4 @@ ffe7962edb79c2ed967b82a82ccfb2ac7eb148a2 vdr-xine-version-802
 10a6bc10e58f45f6cb79f634bdb6b7daa3167742 xine-lib-1_1_11-release
 2a2cc543b27b64a6587dfaef4f1d986eb2f2710a xine-lib-1_1_11_1-release
 66e1654718fb0581846d60c60bc09ae3b6b8c0cf xine-lib-1_1_12-release
+492f87e6963a8d244df32c40d66a6349aabc4420 xine-lib-1_1_13-release
diff --git a/ChangeLog b/ChangeLog
index 15df0e989..12b43f1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,13 +64,14 @@ xine-lib (1.1.90) (Unreleased)
   * Report more video output capabilities via (port)->get_capabilities():
     colour controls, zooming, colour keying.
 
-xine-lib (1.1.12.1) 2008-??-??
+xine-lib (1.1.13) 2008-06-15
   * Security fixes:
     - Buffer overflow in the NSF demuxer which may allow remote attackers to
       cause a denial of service (crash) or possibly execute arbitrary code
       via an NSF file with a long title or copyright message. (CVE-2008-1878)
     - For extra safety against possible Integer overflows like the ones found
       in CVE-2008-1482, backport more calloc usage from 1.2 branch.
+  * Improved JACK output plugin.
   * Added MIME types and .mpp for musepack.
   * Fixed display of some MJPEG streams (YUVJ420P).
   * Deprecate xine_xmalloc() function, see src/xine-utils/utils.c for more
diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h
index 8b8c03df5..0f04818c6 100644
--- a/include/xine/xineutils.h
+++ b/include/xine/xineutils.h
@@ -651,6 +651,13 @@ void xine_usec_sleep(unsigned usec) XINE_PROTECTED;
 #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM))
 #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX))
 
+/**
+ * append to a string, reallocating
+ * normally, updates & returns *dest
+ * on error, *dest is unchanged & NULL is returned.
+ */
+char *xine_strcat_realloc (char **dest, char *append) XINE_PROTECTED;
+
 /*
  * Color Conversion Utility Functions
  * The following data structures and functions facilitate the conversion
diff --git a/misc/xine-config.in b/misc/xine-config.in
index e1192cf46..3a3fd4b4d 100644
--- a/misc/xine-config.in
+++ b/misc/xine-config.in
@@ -6,10 +6,11 @@ unset prefix
 unset exec_prefix
 unset args
 
-export PKG_CONFIG_PATH="$(cat <<'EOF'
+PKG_CONFIG_PATH="`cat <<'EOF'
 @XINE_PKGCONFIG_DIR@
 EOF
-)${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
+`${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
+export PKG_CONFIG_PATH
 
 usage()
 {
diff --git a/po/cs.po b/po/cs.po
index b9c9046a5..fd1c7c4b8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -237,72 +237,72 @@ msgstr ""
 "surround dekodér schopný dekódovat formáty, které chcete přehrát."
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : podporované režimy jsou "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : podporované režimy jsou"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8bitový"
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bitový"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16bitový"
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16bitový"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24bitový"
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24bitový"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32bitový"
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32bitový"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono"
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "stereo"
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " stereo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4kanálový"
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4kanálový"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4kanálový není povolen v konfiguraci xine)"
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1kanálový"
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4kanálový není povolen v konfiguraci xine)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1kanálový není povolen v konfiguraci xine)"
+msgid " 4.1-channel"
+msgstr " 4.1kanálový"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5kanálový"
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1kanálový není povolen v konfiguraci xine)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5kanálový není povolen v kondifuraci xine)"
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5kanálový"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1kanálový"
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5kanálový není povolen v kondifuraci xine)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1kanálový není povolen v konfiguraci xine)"
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1kanálový"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "a/52 a DTS pass-through\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1kanálový není povolen v konfiguraci xine)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(a/52 a DTS pass-through nejsou povoleny v konfiguraci xine)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " a/52 a DTS pass-through"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (a/52 a DTS pass-through nejsou povoleny v konfiguraci xine)"
 
 #: src/audio_out/audio_alsa_out.c:1596
 msgid "alsa mixer device"
@@ -746,24 +746,31 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "zpoždění zvukového výstupu OSS (upraví synchronizaci zvuku a videa)"
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: synchronizace reálného času zvukového zařízení zakázána...\n"
-" audio_oss_out: ...zkouší se velikost výstupní vyrovnávací paměti: "
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d bytů\n"
+"audio_oss_out: synchronizace reálného času zvukového zařízení zakázána...\n"
+"audio_oss_out: ...zkouší se velikost výstupní vyrovnávací paměti: %d bytů\n"
 "audio_oss_out: ...mohou zde být problémy se synchronizací zvuku a videa\n"
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: podporované režimy jsou"
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr " a/52 pass-through"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (a/52 pass-through nejsou povoleny v konfiguraci xine)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "číslo zvukového mixeru OSS, -1 pro žádné"
 
diff --git a/po/de.po b/po/de.po
index 805cb6c4a..bcfd31273 100644
--- a/po/de.po
+++ b/po/de.po
@@ -234,72 +234,72 @@ msgstr ""
 "kann, die Sie über den digitalen Ausgang Ihrer Soundkarte abspielen wollen."
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : Unterstützte Modi sind "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : Unterstützte Modi sind"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8Bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8Bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16Bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16Bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24Bit "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24Bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32Bit "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32Bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "Mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " Mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "Stereo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " Stereo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-Kanal "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-Kanal"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4-Kanal nicht aktiviert in xine Konfiguration) "
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1-Kanal "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4-Kanal nicht aktiviert in xine Konfiguration)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-Kanal nicht aktiviert in xine Konfiguration) "
+msgid " 4.1-channel"
+msgstr " 4.1-Kanal"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5-Kanal "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-Kanal nicht aktiviert in xine Konfiguration)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5-Kanal nicht aktiviert in xine Konfiguration) "
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5-Kanal"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1-Kanal "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5-Kanal nicht aktiviert in xine Konfiguration)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-Kanal nicht aktiviert in xine Konfiguration) "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-Kanal"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "a/52 und DTS pass-through\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-Kanal nicht aktiviert in xine Konfiguration)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(a/52 und DTS pass-through nicht aktiviert in xine Konfiguration)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " a/52 und DTS pass-through"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (a/52 und DTS pass-through nicht aktiviert in xine Konfiguration)"
 
 #: src/audio_out/audio_alsa_out.c:1596
 msgid "alsa mixer device"
@@ -739,24 +739,31 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "Verzögerung der OSS Audioausgabe (Verändert A/V Synchronisation)"
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: Audio-Realzeit-Synchronisation deaktiviert...\n"
-"audio_oss_out: ...Untersuche Größe des Ausgabepuffers: "
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d Bytes\n"
+"audio_oss_out: Audio-Realzeit-Synchronisation deaktiviert...\n"
+"audio_oss_out: ...Untersuche Größe des Ausgabepuffers: %d Bytes\n"
 "audio_oss_out: ...es könnn Audio/Video-Synchronisationsprobleme auftreten\n"
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: Unterstützte Modi sind"
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr " a/52 pass-through"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (a/52 pass-through nicht aktiviert in xine Konfiguration)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "OSS Mixernummer, -1 für keine"
 
diff --git a/po/eo.po b/po/eo.po
index 72a7c676b..effeb0ef3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -190,75 +190,75 @@ msgid ""
 "formats you want to play to your sound card's digital output."
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1494
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : subtenitaj modusoj estas "
+#: src/audio_out/audio_alsa_out.c:1500
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : subtenitaj modusoj estas"
 
-#: src/audio_out/audio_alsa_out.c:1497
-msgid "8bit "
-msgstr "8bitoj "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bitoj"
 
-#: src/audio_out/audio_alsa_out.c:1502
-msgid "16bit "
-msgstr "16bitoj "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16bitoj"
 
-#: src/audio_out/audio_alsa_out.c:1506
-msgid "24bit "
-msgstr "24bitoj "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24bitoj"
 
-#: src/audio_out/audio_alsa_out.c:1510
-msgid "32bit "
-msgstr "32bitoj "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32bitoj"
 
-#: src/audio_out/audio_alsa_out.c:1521
-msgid "mono "
-msgstr "unufonio"
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " unufonio"
 
-#: src/audio_out/audio_alsa_out.c:1525
-msgid "stereo "
-msgstr "stereofonio"
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " stereofonio"
 
-#: src/audio_out/audio_alsa_out.c:1530
-msgid "4-channel "
-msgstr "kvarfonio"
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " kvarfonio"
 
-#: src/audio_out/audio_alsa_out.c:1533
-msgid "(4-channel not enabled in xine config) "
-msgstr "(kvarfonio ne estas ebligita en xine-agordoj) "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (kvarfonio ne estas ebligita en xine-agordoj)"
 
-#: src/audio_out/audio_alsa_out.c:1538
-msgid "4.1-channel "
-msgstr "4.1-kanalo "
+#: src/audio_out/audio_alsa_out.c:1547
+msgid " 4.1-channel"
+msgstr " 4.1-kanalo"
 
-#: src/audio_out/audio_alsa_out.c:1541
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-kanaloj ne estas ebligita en xine-agordoj) "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-kanaloj ne estas ebligita en xine-agordoj)"
 
-#: src/audio_out/audio_alsa_out.c:1546
-msgid "5-channel "
-msgstr "kvinfonio"
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " kvinfonio"
 
-#: src/audio_out/audio_alsa_out.c:1549
-msgid "(5-channel not enabled in xine config) "
-msgstr "(kvinfonio ne estas ebligita en xine-agordoj) "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (kvinfonio ne estas ebligita en xine-agordoj)"
 
-#: src/audio_out/audio_alsa_out.c:1554
-msgid "5.1-channel "
-msgstr "5.1-kanalo "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-kanalo"
 
-#: src/audio_out/audio_alsa_out.c:1557
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-kanaloj ne estas ebligita en xine-agordoj) "
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-kanaloj ne estas ebligita en xine-agordoj)"
 
-#: src/audio_out/audio_alsa_out.c:1580
-msgid "a/52 and DTS pass-through\n"
-msgstr "rektotrajro de a/52 kaj DTS\n"
+#: src/audio_out/audio_alsa_out.c:1589
+msgid " a/52 and DTS pass-through"
+msgstr " rektotrajro de a/52 kaj DTS"
 
-#: src/audio_out/audio_alsa_out.c:1583
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(rektotrajro de a/52 kaj DTS ne estas ebligita en xine-agordoj)\n"
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (rektotrajro de a/52 kaj DTS ne estas ebligita en xine-agordoj)"
 
-#: src/audio_out/audio_alsa_out.c:1590
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "alsa-miksilo"
 
@@ -656,24 +656,32 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "latenco de OSS aŭdeligo (aranĝo de a/v sinkro)"
 
-#: src/audio_out/audio_oss_out.c:880
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: Aŭdozorgilo por realtempa sinkronigo estas malebligita...\n"
-"audio_oss_out: ...sondante grandon de eliga bufro: "
-
-#: src/audio_out/audio_oss_out.c:897
+#: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d bajtoj\n"
+"audio_oss_out: Aŭdozorgilo por realtempa sinkronigo estas malebligita...\n"
+"audio_oss_out: ...sondante grandon de eliga bufro: %d bajtoj\n"
 "audio_oss_out: ...eble ĝi estas problemo de aŭdo/video sinkronigo\n"
 
-#: src/audio_out/audio_oss_out.c:1026
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: subtenitaj modusoj estas"
+
+#: src/audio_out/audio_oss_out.c:1009
+#, fuzzy
+msgid " a/52 pass-through"
+msgstr " rektotrajro de a/52"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (rektotrajro de a/52 ne estas ebligita en xine-agordoj)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "numero de OSS aŭdomiksilo, -1 por nenio"
 
diff --git a/po/es.po b/po/es.po
index 00eced5c1..7a386aecc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -245,74 +245,74 @@ msgstr ""
 "su tarjeta de sonido."
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : los modos soportados son "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : los modos soportados son"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24bit "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32bit "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "estéreo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " estéreo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-canales "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-canales"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4-canales no activado en la configuración de xine) "
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1-canales "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4-canales no activado en la configuración de xine)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-canales no activado en la configuración de xine) "
+msgid " 4.1-channel"
+msgstr " 4.1-canales"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5-canales "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-canales no activado en la configuración de xine)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5-canales no activado en la configuración de xine) "
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5-canales"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1-canales "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5-canales no activado en la configuración de xine)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-canales no activado en la configuración de xine) "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-canales"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "travesía a/52 y DTS\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-canales no activado en la configuración de xine)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(travesía a/52 and DTS no activada en la configuración de xine)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " travesía a/52 y DTS"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (travesía a/52 and DTS no activada en la configuración de xine)"
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "dispositivo mezclador alsa"
 
@@ -758,24 +758,32 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "Latencia de salida de audio OSS audio (ajuste sincronismo a/v)"
 
-#: src/audio_out/audio_oss_out.c:882
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: Sincronismo tiempo real driver de audio desactivado...\n"
-"audio_oss_out: ...ensayando tamaño del búfer de salida: "
-
-#: src/audio_out/audio_oss_out.c:899
+#: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d bytes\n"
+"audio_oss_out: Sincronismo tiempo real driver de audio desactivado...\n"
+"audio_oss_out: ...ensayando tamaño del búfer de salida: %d bytes\n"
 "audio_oss_out: ...puede haber problemas de sincronización audio/vídeo\n"
 
-#: src/audio_out/audio_oss_out.c:1028
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: los modos soportados son"
+
+#: src/audio_out/audio_oss_out.c:1009
+#, fuzzy
+msgid " a/52 pass-through"
+msgstr " travesía a/52"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (travesía a/52 no activada en la configuración de xine)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "número de mezclador audio OSS, -1 para ninguno"
 
diff --git a/po/eu.po b/po/eu.po
index f786ff022..693c4da7e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -237,74 +237,74 @@ msgstr ""
 "formats you want to play to your sound card's digital output."
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : Onartutako moduak: "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : Onartutako moduak:"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24bit "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32bit "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "estereo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " estereo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-kanal "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4-kanal ez dago gaiturik xine konfigruaketan)"
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1-kanal "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4-kanal ez dago gaiturik xine konfigruaketan)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-kanal ez dago gaiturik xine konfigruaketan)"
+msgid " 4.1-channel"
+msgstr " 4.1-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5-kanal "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-kanal ez dago gaiturik xine konfigruaketan)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5-kanal ez dago gaiturik xine konfigruaketan)"
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1-kanal "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5-kanal ez dago gaiturik xine konfigruaketan)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-kanal ez dago gaiturik xine konfigruaketan)"
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "a/52 eta DTS pass-through\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-kanal ez dago gaiturik xine konfigruaketan)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(a/52 eta DTS pass-through ez daude gaiturik xine konfiguraketan)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " a/52 eta DTS pass-through"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (a/52 eta DTS pass-through ez daude gaiturik xine konfiguraketan)"
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "alsa nahasle gailua"
 
@@ -746,25 +746,32 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "OSS audio irteera atzerapena(a/b synk ezarri)"
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: Audio kontrolatzailearen denbora errealeko sinkronia "
-"ezgaitu...\n"
-"audio_oss_out: ...irteera bufffer tamaina frogatzen: "
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d bite\n"
+"audio_oss_out: Audio kontrolatzailearen denbora errealeko sinkronia "
+"ezgaitu...\n"
+"audio_oss_out: ...irteera bufffer tamaina frogatzen: %d bite\n"
 "audio_oss_out: ...audio/bideo sinkronismo arazoak egon daitezke\n"
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: Onartutako moduak:"
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr " a/52 pass-through"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (a/52 pass-through ez daude gaiturik xine konfiguraketan)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "OSS audio nahasle zenbakia, -1 ez erabiltzeko"
 
diff --git a/po/fr.po b/po/fr.po
index 2c50962f5..a05220358 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -246,74 +246,74 @@ msgstr ""
 "surround capable de traiter le signal envoyé par votre carte son. "
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : les modes supportés sont "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : les modes supportés sont"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24bit "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32bit "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "stéréo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " stéréo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-canaux"
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-canaux"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(sortie 4 canaux non activée dans la configuration de xine)"
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "sortie 4.1 canaux"
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (sortie 4 canaux non activée dans la configuration de xine)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(sortie 4.1 canaux non activée dans la configuration de xine)"
+msgid " 4.1-channel"
+msgstr " sortie 4.1 canaux"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "Sortie 5 canaux"
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (sortie 4.1 canaux non activée dans la configuration de xine)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(Sortie 5 canaux non activée dans la configuration de xine)"
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " Sortie 5 canaux"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "Sortie 5.1 canaux"
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (Sortie 5 canaux non activée dans la configuration de xine)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(Sortie 5.1 canaux non activée dans la configuration de xine)"
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " Sortie 5.1 canaux"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr ""
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (Sortie 5.1 canaux non activée dans la configuration de xine)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(a/52 et DTS pass-through non activés dans la configuration de xine)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " a/52 et DTS pass-through"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (a/52 et DTS pass-through non activés dans la configuration de xine)"
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "périphérique du mixeur alsa"
 
@@ -712,20 +712,28 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "Temps de latence de la sortie audio OSS (ajustement de a/v sync) "
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out : les modes supportés sont"
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr " a/52 pass-through"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (a/52 pass-through non activé dans la configuration de xine)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 0594f9c2e..f6306905d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -238,75 +238,75 @@ msgstr ""
 "formati che si vogliono riprodurre."
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : i modi supportati sono "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : i modi supportati sono"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8-bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8-bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16-bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16-bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24-bit"
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24-bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32-bit"
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32-bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "stereo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " stereo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-canali "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-canali"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4-canali non abilitato nella configurazione di xine) "
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1-canali "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4-canali non abilitato nella configurazione di xine)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-canali non abilitati nella configurazione di xine) "
+msgid " 4.1-channel"
+msgstr " 4.1-canali"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5-canali "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-canali non abilitati nella configurazione di xine)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5-canali non abilitati nella configurazione di xine) "
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5-canali"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1-canali "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5-canali non abilitati nella configurazione di xine)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-canali non abilitati nella configurazione di xine) "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-canali"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "passaggio diretto a/52 e DTS\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-canali non abilitati nella configurazione di xine)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " passaggio diretto a/52 e DTS"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
 msgstr ""
-"(passaggio diretto a/53 e DTS non abilitato nella configurazione di xine)\n"
+" (passaggio diretto a/52 e DTS non abilitato nella configurazione di xine)"
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "dispositivo mixer di alsa"
 
@@ -587,12 +587,11 @@ msgstr ""
 msgid "xine audio output plugin using IRIX libaudio"
 msgstr "plugin di uscita audio per xine utilizzante libaudio IRIX"
 
-#: src/audio_out/audio_jack_out.c:408
-#, fuzzy
+#: src/audio_out/audio_jack_out.c:406
 msgid "xine output plugin for JACK Audio Connection Kit"
-msgstr "plugin di uscita audio per xine per Coreaudio/Max OS X"
+msgstr "plugin di uscita audio per xine per JACK Audio Connection Kit"
 
-#: src/audio_out/audio_none_out.c:229
+#: src/audio_out/audio_none_out.c:223
 msgid "xine dummy audio output plugin"
 msgstr "pluging output audio dummy di xine"
 
@@ -750,24 +749,34 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "latenza nell'uscita audio OSS (calibra sincronia audio/video)"
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: driver audio real time con sincronizzazione disabilitato...\n"
-"audio_oss_out: ...si sta provando la dimensione del buffer di output: "
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d byte\n"
+"audio_oss_out: driver audio real time con sincronizzazione disabilitato...\n"
+"audio_oss_out: ...si sta provando la dimensione del buffer di output: %d "
+"byte\n"
 "audio_oss_out: ... potrebbe essereci sincronizzazione audio/video\n"
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: i modi supportati sono"
+
+#: src/audio_out/audio_oss_out.c:1009
+#, fuzzy
+msgid " a/52 pass-through"
+msgstr " passaggio diretto a/52"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr ""
+" (passaggio diretto a/52 non abilitato nella configurazione di xine)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "Numero del mixer audio OSS, -1 per nessuno."
 
@@ -798,21 +807,20 @@ msgstr ""
 "plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
 "di oss"
 
-#: src/audio_out/audio_pulse_out.c:548
-#, fuzzy
+#: src/audio_out/audio_pulse_out.c:549
 msgid "device used for pulseaudio"
-msgstr "dispositivo utilizzato per CD audio"
+msgstr "dispositivo utilizzato per PulseAudio"
 
 #: src/audio_out/audio_pulse_out.c:549
 msgid "use 'server[:sink]' for setting the pulseaudio sink device."
 msgstr ""
+"Si usi 'server[:sink]' per impostare il dispositivo sink di PulseAudio."
 
-#: src/audio_out/audio_pulse_out.c:603
-#, fuzzy
+#: src/audio_out/audio_pulse_out.c:583
 msgid "xine audio output plugin using pulseaudio sound server"
-msgstr "pluging output audio di xine che usa esound"
+msgstr "plugin di output audio di xine che usa il server sonoro PulseAudio"
 
-#: src/audio_out/audio_sun_out.c:455 src/audio_out/audio_sun_out.c:948
+#: src/audio_out/audio_sun_out.c:457 src/audio_out/audio_sun_out.c:950
 #, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
 msgstr "audio_sun_out: apertura dispositivo audio %s non riuscita: %s\n"
diff --git a/po/libxine2.pot b/po/libxine2.pot
index 41771bd13..1d19b3a4b 100644
--- a/po/libxine2.pot
+++ b/po/libxine2.pot
@@ -184,74 +184,74 @@ msgid ""
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
+msgid "audio_alsa_out : supported modes are"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr ""
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
+msgid " 4.1-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1589
 msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr ""
+
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr ""
 
@@ -634,20 +634,27 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:882
+#: src/audio_out/audio_oss_out.c:894
+#, c-format
 msgid ""
 "audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
+"audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:899
-#, c-format
-msgid ""
-"%d bytes\n"
-"audio_oss_out: ...there may be audio/video synchronization issues\n"
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr ""
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr ""
+
+#: src/audio_out/audio_oss_out.c:1012
+msgid " (a/52 pass-through not enabled in xine config)"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:1028
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 213c187f6..1d257eeb9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -190,77 +190,77 @@ msgid ""
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
-msgstr "audio_alsa_out : podporované módy sú "
+msgid "audio_alsa_out : supported modes are"
+msgstr "audio_alsa_out : podporované módy sú"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
+#: src/audio_out/audio_alsa_out.c:1509
 #, fuzzy
-msgid "16bit "
-msgstr "8bit "
+msgid " 16bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
+#: src/audio_out/audio_alsa_out.c:1513
 #, fuzzy
-msgid "24bit "
-msgstr "8bit "
+msgid " 24bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
+#: src/audio_out/audio_alsa_out.c:1517
 #, fuzzy
-msgid "32bit "
-msgstr "8bit "
+msgid " 32bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "stereo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " stereo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-kanály "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-kanály"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4-kanály nepovolené v xine konfigu) "
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1-kanálov "
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4-kanály nepovolené v xine konfigu)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-kanálov nepovolené v xine konfigu) "
+msgid " 4.1-channel"
+msgstr " 4.1-kanálov"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5-kanálov "
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-kanálov nepovolené v xine konfigu)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5-kanálov nepovolené v xine konfigu) "
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5-kanálov"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1-kanálov "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5-kanálov nepovolené v xine konfigu)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-kanálov nepovolené v xine konfigu) "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-kanálov"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "a/52 a DTS pass-through\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-kanálov nepovolené v xine konfigu)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(a/52 a DTS pass-through not enabled in xine config)\n"
+msgid " a/52 and DTS pass-through"
+msgstr " a/52 a DTS pass-through"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (a/52 a DTS pass-through not enabled in xine config)"
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "alsa mixovacie zaridenie"
 
@@ -670,24 +670,30 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "výstupné oneskorenie esd audia (nastavte odstup a/v)"
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: RT synchronizácia audio ovládača zakázaná ...\n"
-"audio_oss_out: ...zisťujem veľkosť výst. vyrovn. pamäte: "
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d bytov\n"
+"audio_oss_out: RT synchronizácia audio ovládača zakázaná ...\n"
+"audio_oss_out: ...zisťujem veľkosť výst. vyrovn. pamäte: %d bytov\n"
 "audio_oss_out: ...môžu byť problémy s audio/video synchronizáciou\n"
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: podporované módy sú"
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr " a/52 pass-through"
+
+#: src/audio_out/audio_oss_out.c:1012
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr ""
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index a4fb503b8..17f74c4b8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -203,74 +203,74 @@ msgstr ""
 "Stereo 2.0: Sol ve sağ kanal için iki hoparlörünüz var demektir."
 
 #: src/audio_out/audio_alsa_out.c:1500
-msgid "audio_alsa_out : supported modes are "
+msgid "audio_alsa_out : supported modes are"
 msgstr "audio_alsa_out : desteklenen kipler"
 
-#: src/audio_out/audio_alsa_out.c:1503
-msgid "8bit "
-msgstr "8bit "
+#: src/audio_out/audio_alsa_out.c:1504
+msgid " 8bit"
+msgstr " 8bit"
 
-#: src/audio_out/audio_alsa_out.c:1508
-msgid "16bit "
-msgstr "16bit "
+#: src/audio_out/audio_alsa_out.c:1509
+msgid " 16bit"
+msgstr " 16bit"
 
-#: src/audio_out/audio_alsa_out.c:1512
-msgid "24bit "
-msgstr "24bit "
+#: src/audio_out/audio_alsa_out.c:1513
+msgid " 24bit"
+msgstr " 24bit"
 
-#: src/audio_out/audio_alsa_out.c:1516
-msgid "32bit "
-msgstr "32bit "
+#: src/audio_out/audio_alsa_out.c:1517
+msgid " 32bit"
+msgstr " 32bit"
 
-#: src/audio_out/audio_alsa_out.c:1527
-msgid "mono "
-msgstr "mono "
+#: src/audio_out/audio_alsa_out.c:1530 src/audio_out/audio_oss_out.c:963
+msgid " mono"
+msgstr " mono"
 
-#: src/audio_out/audio_alsa_out.c:1531
-msgid "stereo "
-msgstr "stereo "
+#: src/audio_out/audio_alsa_out.c:1534 src/audio_out/audio_oss_out.c:969
+msgid " stereo"
+msgstr " stereo"
 
-#: src/audio_out/audio_alsa_out.c:1536
-msgid "4-channel "
-msgstr "4-kanal "
+#: src/audio_out/audio_alsa_out.c:1539 src/audio_out/audio_oss_out.c:976
+msgid " 4-channel"
+msgstr " 4-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1539
-msgid "(4-channel not enabled in xine config) "
-msgstr "(4-kanal xine yapılandırmasında etkinleştirilmemiş) "
-
-#: src/audio_out/audio_alsa_out.c:1544
-msgid "4.1-channel "
-msgstr "4.1-kanal"
+#: src/audio_out/audio_alsa_out.c:1542 src/audio_out/audio_oss_out.c:979
+msgid " (4-channel not enabled in xine config)"
+msgstr " (4-kanal xine yapılandırmasında etkinleştirilmemiş)"
 
 #: src/audio_out/audio_alsa_out.c:1547
-msgid "(4.1-channel not enabled in xine config) "
-msgstr "(4.1-kanal xine yapılandırmasında etkinleştirilmemiş) "
+msgid " 4.1-channel"
+msgstr " 4.1-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1552
-msgid "5-channel "
-msgstr "5-kanal"
+#: src/audio_out/audio_alsa_out.c:1550
+msgid " (4.1-channel not enabled in xine config)"
+msgstr " (4.1-kanal xine yapılandırmasında etkinleştirilmemiş)"
 
-#: src/audio_out/audio_alsa_out.c:1555
-msgid "(5-channel not enabled in xine config) "
-msgstr "(5-kanal xine yapılandırmasında etkinleştirilmemiş) "
+#: src/audio_out/audio_alsa_out.c:1555 src/audio_out/audio_oss_out.c:986
+msgid " 5-channel"
+msgstr " 5-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1560
-msgid "5.1-channel "
-msgstr "5.1-kanal "
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:989
+msgid " (5-channel not enabled in xine config)"
+msgstr " (5-kanal xine yapılandırmasında etkinleştirilmemiş)"
 
-#: src/audio_out/audio_alsa_out.c:1563
-msgid "(5.1-channel not enabled in xine config) "
-msgstr "(5.1-kanal xine yapılandırmasında etkinleştirilmemiş) "
+#: src/audio_out/audio_alsa_out.c:1563 src/audio_out/audio_oss_out.c:996
+msgid " 5.1-channel"
+msgstr " 5.1-kanal"
 
-#: src/audio_out/audio_alsa_out.c:1586
-msgid "a/52 and DTS pass-through\n"
-msgstr "a/52 and DTS pass-through\n"
+#: src/audio_out/audio_alsa_out.c:1566 src/audio_out/audio_oss_out.c:999
+msgid " (5.1-channel not enabled in xine config)"
+msgstr " (5.1-kanal xine yapılandırmasında etkinleştirilmemiş)"
 
 #: src/audio_out/audio_alsa_out.c:1589
-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr "(a/52 and DTS pass-through xine yapılandırmasında etkinleştirilmemiş))\n"
+msgid " a/52 and DTS pass-through"
+msgstr " a/52 and DTS pass-through"
+
+#: src/audio_out/audio_alsa_out.c:1592
+msgid " (a/52 and DTS pass-through not enabled in xine config)"
+msgstr " (a/52 and DTS pass-through xine yapılandırmasında etkinleştirilmemiş)"
 
-#: src/audio_out/audio_alsa_out.c:1596
+#: src/audio_out/audio_alsa_out.c:1602
 msgid "alsa mixer device"
 msgstr "alsa karıştırıcı aygıtı"
 
@@ -690,24 +690,31 @@ msgstr ""
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr "OSS ses çıkışı gecikme süresi (a/v/ senkronunu ayarlayın)"
 
-#: src/audio_out/audio_oss_out.c:877
-msgid ""
-"audio_oss_out: Audio driver realtime sync disabled...\n"
-"audio_oss_out: ...probing output buffer size: "
-msgstr ""
-"audio_oss_out: Ses sürücüsü gerçek zamanlı senkron etkisizleştirildi...\n"
-"audio_oss_out: ...çıkış tampon boyutunu araştırıyor: "
-
 #: src/audio_out/audio_oss_out.c:894
 #, c-format
 msgid ""
-"%d bytes\n"
+"audio_oss_out: Audio driver realtime sync disabled...\n"
+"audio_oss_out: ...probing output buffer size: %d bytes\n"
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
-"%d bytes\n"
+"audio_oss_out: Ses sürücüsü gerçek zamanlı senkron etkisizleştirildi...\n"
+"audio_oss_out: ...çıkış tampon boyutunu araştırıyor: %d bytes\n"
 "audio_oss_out: ...burada ses/görüntü senkronizasyon sorunları olabilir\n"
 
-#: src/audio_out/audio_oss_out.c:1023
+#: src/audio_out/audio_oss_out.c:958
+msgid "audio_oss_out: supported modes are"
+msgstr "audio_oss_out: desteklenen kipler"
+
+#: src/audio_out/audio_oss_out.c:1009
+msgid " a/52 pass-through"
+msgstr " a/52 pass-through"
+
+#: src/audio_out/audio_oss_out.c:1012
+#, fuzzy
+msgid " (a/52 pass-through not enabled in xine config)"
+msgstr " (a/52 pass-through xine yapılandırmasında etkinleştirilmemiş)"
+
+#: src/audio_out/audio_oss_out.c:1027
 msgid "OSS audio mixer number, -1 for none"
 msgstr "OSS ses karıştırıcısı numarası, hiçbiri için -1"
 
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 540d688df..cd6254281 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -1497,70 +1497,73 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 			  "formats you want to play to your sound card's digital output."),
 			0, alsa_speaker_arrangement_cb, this);
 
-  xprintf(class->xine, XINE_VERBOSITY_LOG, _("audio_alsa_out : supported modes are "));
+  char *logmsg = strdup (_("audio_alsa_out : supported modes are"));
+
   if (!(snd_pcm_hw_params_test_format(this->audio_fd, params, SND_PCM_FORMAT_U8))) {
     this->capabilities |= AO_CAP_8BITS;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("8bit "));
+    xine_strcat_realloc (&logmsg, _(" 8bit"));
   }
   /* ALSA automatically appends _LE or _BE depending on the CPU */
   if (!(snd_pcm_hw_params_test_format(this->audio_fd, params, SND_PCM_FORMAT_S16))) {
     this->capabilities |= AO_CAP_16BITS;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("16bit "));
+    xine_strcat_realloc (&logmsg, _(" 16bit"));
   }
   if (!(snd_pcm_hw_params_test_format(this->audio_fd, params, SND_PCM_FORMAT_S24))) {
     this->capabilities |= AO_CAP_24BITS;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("24bit "));
+    xine_strcat_realloc (&logmsg, _(" 24bit"));
   }
   if (!(snd_pcm_hw_params_test_format(this->audio_fd, params, SND_PCM_FORMAT_FLOAT))) {
     this->capabilities |= AO_CAP_FLOAT32;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("32bit "));
+    xine_strcat_realloc (&logmsg, _(" 32bit"));
   }
   if (0 == (this->capabilities & (AO_CAP_FLOAT32 | AO_CAP_24BITS | AO_CAP_16BITS | AO_CAP_8BITS))) {
-    xprintf (this->class->xine, XINE_VERBOSITY_DEBUG,
-        "\naudio_alsa_out: no supported PCM format found\n");
+    xprintf(class->xine, XINE_VERBOSITY_LOG, "%s\n", logmsg);
+    free (logmsg);
+    xprintf (class->xine, XINE_VERBOSITY_DEBUG,
+             "audio_alsa_out: no supported PCM format found\n");
     snd_pcm_close(this->audio_fd);
     free(this);
     return NULL;
   }
   if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 1))) {
     this->capabilities |= AO_CAP_MODE_MONO;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("mono "));
+    xine_strcat_realloc (&logmsg, _(" mono"));
   }
   if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 2))) {
     this->capabilities |= AO_CAP_MODE_STEREO;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("stereo "));
+    xine_strcat_realloc (&logmsg, _(" stereo"));
   }
   if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 4)) &&
      ( speakers == SURROUND4 )) {
     this->capabilities |= AO_CAP_MODE_4CHANNEL;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("4-channel "));
+    xine_strcat_realloc (&logmsg, _(" 4-channel"));
   } 
   else
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("(4-channel not enabled in xine config) "));
+    xine_strcat_realloc (&logmsg, _(" (4-channel not enabled in xine config)"));
   
   if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) && 
      ( speakers == SURROUND41 )) {
     this->capabilities |= AO_CAP_MODE_4_1CHANNEL;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("4.1-channel "));
+    xine_strcat_realloc (&logmsg, _(" 4.1-channel"));
   } 
   else
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("(4.1-channel not enabled in xine config) "));
+    xine_strcat_realloc (&logmsg, _(" (4.1-channel not enabled in xine config)"));
 
   if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) && 
      ( speakers == SURROUND5 )) {
     this->capabilities |= AO_CAP_MODE_5CHANNEL;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("5-channel "));
+    xine_strcat_realloc (&logmsg, _(" 5-channel"));
   } 
   else
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("(5-channel not enabled in xine config) "));
+    xine_strcat_realloc (&logmsg, _(" (5-channel not enabled in xine config)"));
 
   if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 6)) && 
      ( speakers >= SURROUND51 )) {
     this->capabilities |= AO_CAP_MODE_5_1CHANNEL;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("5.1-channel "));
+    xine_strcat_realloc (&logmsg, _(" 5.1-channel"));
   } 
   else
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("(5.1-channel not enabled in xine config) "));
+    xine_strcat_realloc (&logmsg, _(" (5.1-channel not enabled in xine config)"));
 
   this->has_pause_resume = 0; /* This is checked at open time instead */
   this->is_paused = 0;
@@ -1583,10 +1586,13 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   if ( speakers == A52_PASSTHRU ) {
     this->capabilities |= AO_CAP_MODE_A52;
     this->capabilities |= AO_CAP_MODE_AC5;
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("a/52 and DTS pass-through\n"));
+    xine_strcat_realloc (&logmsg, _(" a/52 and DTS pass-through"));
   } 
   else
-    xprintf(class->xine, XINE_VERBOSITY_LOG, _("(a/52 and DTS pass-through not enabled in xine config)\n"));
+    xine_strcat_realloc (&logmsg, _(" (a/52 and DTS pass-through not enabled in xine config)"));
+
+  xprintf(class->xine, XINE_VERBOSITY_LOG, "%s\n", logmsg);
+  free (logmsg);
 
   /* printf("audio_alsa_out: capabilities 0x%X\n",this->capabilities); */
 
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
index 6751dc839..f1a011a6c 100644
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -17,381 +17,894 @@
 #define AO_OUT_JACK_IFACE_VERSION 9
 
 #define GAP_TOLERANCE        AO_MAX_GAP
-#define BUFSIZE              81920
+/* maximum number of channels supported, avoids lots of mallocs */
+#define MAX_CHANS 6
 
-typedef struct jack_driver_s {
+typedef struct jack_driver_s
+{
+  ao_driver_t	ao_driver;
+  xine_t	*xine;
+
+  int		capabilities;
+  int		mode;
+  int		paused;
+  int		underrun;
+
+  int32_t	output_sample_rate, input_sample_rate;
+  uint32_t	num_channels;
+  uint32_t	bits_per_sample;
+  uint32_t	bytes_per_frame;
+  uint32_t	bytes_in_buffer; /* number of bytes writen to audio hardware */
+  uint32_t	fragment_size;
+
+  jack_client_t	*client;
+  jack_port_t	*ports[MAX_CHANS];
+
+  /*! buffer for audio data */
+  unsigned char	*buffer;
+
+  /*! buffer read position, may only be modified by playback thread or while it is stopped */
+  uint32_t	read_pos;
+  /*! buffer write position, may only be modified by MPlayer's thread */
+  uint32_t	write_pos;
+
+  struct
+  {
+    int		volume;
+    int		mute;
+  } mixer;
 
-    ao_driver_t    ao_driver;
-    xine_t        *xine;
+} jack_driver_t;
 
-    int            capabilities;
+typedef struct
+{
+  audio_driver_class_t	driver_class;
+  config_values_t	*config;
+  xine_t		*xine;
+} jack_class_t;
 
-    int32_t        sample_rate;
-    uint32_t       num_channels;
-    uint32_t       bits_per_sample;
-    uint32_t       bytes_per_frame;
 
-    jack_client_t *client;
-    jack_port_t   *port_1;
-    jack_port_t   *port_2;
-    float          buf_1[BUFSIZE];
-    float          buf_2[BUFSIZE];
-    uint32_t       buf_read;
-    uint32_t       buf_write;
+/**************************************************************
+ *
+ * Simple ringbuffer implementation
+ * Lifted from mplayer ao_jack.c
+ *
+**************************************************************/
+
+
+/*! size of one chunk, if this is too small Xine will start to "stutter" */
+/*! after a short time of playback */
+#define CHUNK_SIZE (16 * 1024)
+/*! number of "virtual" chunks the buffer consists of */
+#define NUM_CHUNKS 8
+/* This type of ring buffer may never fill up completely, at least */
+/* one byte must always be unused. */
+/* For performance reasons (alignment etc.) one whole chunk always stays */
+/* empty, not only one byte. */
+#define BUFFSIZE ((NUM_CHUNKS + 1) * CHUNK_SIZE)
+
+/**
+ * \brief get the number of free bytes in the buffer
+ * \return number of free bytes in buffer
+ * 
+ * may only be called by Xine's thread
+ * return value may change between immediately following two calls,
+ * and the real number of free bytes might be larger!
+ */
+static int buf_free (jack_driver_t *this)
+{
+  int free = this->read_pos - this->write_pos - CHUNK_SIZE;
+  if (free < 0)
+    free += BUFFSIZE;
+  return free;
+}
 
-    uint32_t       volume;
-    uint32_t       mute;
+/**
+ * \brief get amount of data available in the buffer
+ * \return number of bytes available in buffer
+ *
+ * may only be called by the playback thread
+ * return value may change between immediately following two calls,
+ * and the real number of buffered bytes might be larger!
+ */
+static int buf_used (jack_driver_t *this)
+{
+  int used = this->write_pos - this->read_pos;
+  if (used < 0)
+    used += BUFFSIZE;
+  return used;
+}
 
-} jack_driver_t;
+/**
+ * \brief insert len bytes into buffer
+ * \param data data to insert
+ * \param len length of data
+ * \return number of bytes inserted into buffer
+ *
+ * If there is not enough room, the buffer is filled up
+ *
+ * TODO: Xine should really pass data as float, perhaps in V1.2?
+ */
+static int write_buffer_32 (jack_driver_t *this, unsigned char *data, int len)
+{
+  int first_len = BUFFSIZE - this->write_pos;
+  int free = buf_free (this);
+  if (len > free)
+    len = free;
+  if (first_len > len)
+    first_len = len;
+
+  /* copy from current write_pos to end of buffer */
+  memcpy (&(this->buffer[this->write_pos]), data, first_len);
+  if (len > first_len) {	/* we have to wrap around */
+    /* remaining part from beginning of buffer */
+    memcpy (this->buffer, &data[first_len], len - first_len);
+  }
+  this->write_pos = (this->write_pos + len) % BUFFSIZE;
+
+  return len;
+}
+
+static int write_buffer_16 (jack_driver_t *this, unsigned char *data, int len)
+{
+  int samples_free = buf_free (this) / (sizeof (float));
+  int samples = len / 2;
+  if (samples > samples_free)
+    samples = samples_free;
+
+  /* Rename some pointers so that the next bit of gymnastics is easier to read */
+  uint32_t write_pos = this->write_pos;
+  float *p_write;
+  int16_t *p_read = (int16_t *) data;
+  int i;
+  for (i = 0; i < samples; i++) {
+    /* Read in 16bits, write out floats */
+    p_write = (float *) (&(this->buffer[write_pos]));
+    *p_write = ((float) (p_read[i])) / 32767.0f;
+    write_pos = (write_pos + sizeof (float)) % BUFFSIZE;
+  }
+  this->write_pos = write_pos;
+
+  return samples * 2;
+}
 
-typedef struct {
-    audio_driver_class_t  driver_class;
-    config_values_t      *config;
-    xine_t               *xine;
-} jack_class_t;
 
 
-static int jack_process(jack_nframes_t nframes, void *arg)
+/**
+ * \brief read data from buffer and splitting it into channels
+ * \param bufs num_bufs float buffers, each will contain the data of one channel
+ * \param cnt number of samples to read per channel
+ * \param num_bufs number of channels to split the data into
+ * \return number of samples read per channel, equals cnt unless there was too
+ *         little data in the buffer
+ *
+ * Assumes the data in the buffer is of type float, the number of bytes
+ * read is res * num_bufs * sizeof(float), where res is the return value.
+ * If there is not enough data in the buffer remaining parts will be filled
+ * with silence.
+ */
+static int read_buffer (jack_driver_t *this, float **bufs, int cnt,
+			int num_bufs, float gain)
 {
-    jack_driver_t *this = (jack_driver_t *)arg;
-    uint32_t local_buf_read = this->buf_read;
-    uint32_t local_buf_write = this->buf_write;
-    uint32_t src_channel, target_channel;
-    uint32_t frame;
-    float *buf, *out;
-    float gain = 0;
-
-    if (!this->client) return 0;
-
-    if (!this->mute) {
-	gain = (float)this->volume / 100.0;
+  int buffered = buf_used (this);
+  int i, j;
+  int orig_cnt = cnt;
+  if (cnt * sizeof (float) * num_bufs > buffered)
+    cnt = buffered / (sizeof (float) * num_bufs);
+
+  uint32_t read_pos = this->read_pos;
+  unsigned char *buffer = this->buffer;
+  for (i = 0; i < cnt; i++) {
+    for (j = 0; j < num_bufs; j++) {
+      bufs[j][i] = *((float *) (&(buffer[read_pos]))) * gain;
+      read_pos = (read_pos + sizeof (float)) % BUFFSIZE;
     }
+  }
+  this->read_pos = read_pos;
+  for (i = cnt; i < orig_cnt; i++)
+    for (j = 0; j < num_bufs; j++)
+      bufs[j][i] = 0;
 
-    for (target_channel = 0; target_channel < 2; ++target_channel) {
-	    
-	if (target_channel < this->num_channels) src_channel = target_channel;
-	else src_channel = 0;
+  return cnt;
+}
 
-        jack_port_t *port = (target_channel ? this->port_2 : this->port_1);
-        if (!port) continue;
+/**
+ * \brief fill the buffers with silence
+ * \param bufs num_bufs float buffers, each will contain the data of one channel
+ * \param cnt number of samples in each buffer
+ * \param num_bufs number of buffers
+ */
+static void silence (float **bufs, int cnt, int num_bufs)
+{
+  int i, j;
+  for (i = 0; i < cnt; i++)
+    for (j = 0; j < num_bufs; j++)
+      bufs[j][i] = 0;
+}
 
-        buf = (src_channel ? this->buf_2 : this->buf_1);
-        out = (float *)jack_port_get_buffer(port, nframes);
 
-        local_buf_read = this->buf_read;
-        frame = 0;
+/**************************************************************
+ *
+ * Jack interface functions
+ *
+**************************************************************/
 
-        while (frame < nframes && local_buf_read != local_buf_write) {
 
-            // local_buf_write doesn't change during this process,
-            // so we can safely defer updating buf_read until after
+/**
+ * \brief stop playing and empty buffers (for seeking/pause)
+ */
+static void jack_reset (jack_driver_t *this)
+{
+  this->paused = 1;
+  this->read_pos = this->write_pos = 0;
+  this->paused = 0;
+}
 
-            out[frame++] = buf[local_buf_read] * gain;
-            if (++local_buf_read == BUFSIZE) local_buf_read = 0;
-        }
+static int jack_callback (jack_nframes_t nframes, void *arg)
+{
+  jack_driver_t *this = (jack_driver_t *) arg;
 
-	if (frame < nframes) {
-//	    printf("jack_process: underrun: %u required, %u available\n",
-//		   nframes, frame);
-	    while (frame < nframes) {
-		out[frame++] = 0.0f;
-	    }
-	}
+  if (!this->client) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "jack_callback: called without a client parameter? silently trying to continue...\n");
+    return 0;
+  }
+
+  float gain = 0;
+  if (!this->mixer.mute) {
+    gain = (float) this->mixer.volume / 100.0;
+    gain *= gain;		/* experiment with increasing volume range */
+  }
+
+  float *bufs[MAX_CHANS];
+  int i;
+  for (i = 0; i < this->num_channels; i++)
+    bufs[i] = jack_port_get_buffer (this->ports[i], nframes);
+
+  if (this->paused || this->underrun) {
+    silence (bufs, nframes, this->num_channels);
+  } else {
+    int frames_read = read_buffer (this, bufs, nframes, this->num_channels, gain);
+    if (frames_read < nframes) {
+      xprintf (this->xine, XINE_VERBOSITY_LOG,
+	       "jack_callback: underrun - frames read: %d\n", frames_read);
+      this->underrun = 1;
     }
+  }
 
-    this->buf_read = local_buf_read;
+  return 0;
+}
 
 
-//    printf("jack_process: buf_read %u, buf_write %u\n", this->buf_read, this->buf_write);
+static void jack_shutdown (void *arg)
+{
+  jack_driver_t *this = (jack_driver_t *) arg;
+  this->client = NULL;
+}
 
-    return 0;
+/*
+ * Open the Jack audio device
+ * Return 1 on success, 0 on failure
+ * All error handling rests with the caller, we just try to open the device here
+ */
+static int jack_open_device (ao_driver_t *this_gen, char *jack_device,
+			     int32_t *poutput_sample_rate, int num_channels)
+{
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  const char **matching_ports = NULL;
+  char *port_name = NULL;
+  jack_client_t *client = this->client;
+
+  int port_flags = JackPortIsInput;
+  int i;
+  int num_ports;
+
+  if (num_channels > MAX_CHANS) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "jack_open_device: Invalid number of channels: %i\n",
+	     num_channels);
+    goto err_out;
+  }
+  /* Try to create a client called "xine" */
+  if ((client = jack_client_new ("xine")) == 0) {
+    /* If that doesn't work it could be because running two copies of xine - try using a unique name */
+    char client_name[20];
+    sprintf (client_name, "xine (%d)", (int) getpid ());
+
+    if ((client = jack_client_new (client_name)) == 0) {
+      xprintf (this->xine, XINE_VERBOSITY_LOG,
+	       "\njack_open_device: Error: Failed to connect to JACK server\n");
+      xprintf (this->xine, XINE_VERBOSITY_LOG,
+	       "jack_open_device: (did you start 'jackd' server?)\n");
+      goto err_out;
+    }
+  }
+
+  /* Save the new client */
+  this->client = client;
+
+  jack_reset (this);
+  jack_set_process_callback (client, jack_callback, this);
+
+  /* list matching ports */
+  if (!jack_device)
+    port_flags |= JackPortIsPhysical;
+  matching_ports = jack_get_ports (client, jack_device, NULL, port_flags);
+  for (num_ports = 0; matching_ports && matching_ports[num_ports];
+       num_ports++);
+  if (!num_ports) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "jack_open_device: no physical ports available\n");
+    goto err_out;
+  }
+  if (num_ports < num_channels) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "jack_open_device: not enough physical ports available\n");
+    goto err_out;
+  }
+
+  /* create output ports */
+  for (i = 0; i < num_channels; i++) {
+    char pname[50];
+    snprintf (pname, 50, "out_%d", i);
+    this->ports[i] =
+      jack_port_register (client, pname, JACK_DEFAULT_AUDIO_TYPE,
+			  JackPortIsOutput, 0);
+    if (!this->ports[i]) {
+      xprintf (this->xine, XINE_VERBOSITY_LOG,
+	       "jack_open_device: could not create output ports?  Why not?\n");
+      goto err_out;
+    }
+  }
+  if (jack_activate (client)) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "jack_open_device: jack_activate() failed\n");
+    goto err_out;
+  }
+  for (i = 0; i < num_channels; i++) {
+    if (jack_connect
+	(client, jack_port_name (this->ports[i]), matching_ports[i])) {
+      xprintf (this->xine, XINE_VERBOSITY_LOG,
+	       "jack_open_device: jack_connect() failed\n");
+      goto err_out;
+    }
+  }
+  *poutput_sample_rate = jack_get_sample_rate (client);
+
+  free (matching_ports);
+  return 1;
+
+err_out:
+  free (matching_ports);
+  if (client) {
+    jack_client_close (client);
+    this->client = NULL;
+  }
+  return 0;
 }
-    
 
-static void jack_shutdown(void *arg)
+
+/**************************************************************
+ *
+ * Xine interface functions
+ *
+**************************************************************/
+
+
+/**
+ * close the device and reset the play position
+ */
+static void ao_jack_close (ao_driver_t *this_gen)
 {
-    jack_driver_t *this = (jack_driver_t *)arg;
-    this->client = 0;
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  xprintf (this->xine, XINE_VERBOSITY_DEBUG, "ao_jack_close: closing\n");
+
+  jack_reset (this);
+  if (this->client) {
+    jack_client_close (this->client);
+    this->client = NULL;
+  }
 }
 
 /*
  * open the audio device for writing to
  */
-static int ao_jack_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int mode)
+static int ao_jack_open (ao_driver_t *this_gen, uint32_t bits, uint32_t rate,
+			 int mode)
 {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  config_values_t *config = this->xine->config;
+  char *jack_device;
 
-    if (bits != 16) {
-	fprintf(stderr, "ao_jack_open: bits=%u expected %u\n", bits, 16);
-	return 0;
-    }
+  jack_device =
+    config->lookup_entry (config, "audio.device.jack_device_name")->str_value;
 
-    rate = jack_get_sample_rate(this->client);
-    fprintf(stderr, "ao_jack_open: JACK sample rate is %u\n", rate);
+  xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	   "ao_jack_open: ao_open rate=%d, mode=%d, bits=%d dev=%s\n", rate,
+	   mode, bits, jack_device);
+
+  if ((bits != 16) && (bits != 32)) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "ao_jack_open: bits=%u expected 16 or 32bit only\n", bits);
+    return 0;
+  }
 
-    switch (mode) {
-    case AO_CAP_MODE_MONO:
-	this->num_channels = 1;
-	break;
-    case AO_CAP_MODE_STEREO:
-	this->num_channels = 2;
-	break;
+  if ((mode & this->capabilities) == 0) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "ao_jack_open: unsupported mode %08x\n", mode);
+    return 0;
+  }
+
+  /* If device open already then either re-use it or close it */
+  if (this->client) {
+    if ((mode == this->mode) && (rate == this->input_sample_rate)) {
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	       "ao_jack_open: device already open, reusing it\n");
+      return this->output_sample_rate;
     }
 
-    this->buf_read = this->buf_write = 0;
-    this->sample_rate = rate;
-    this->bits_per_sample = bits;
-    this->capabilities = AO_CAP_16BITS | AO_CAP_MODE_MONO | \
-	AO_CAP_MODE_STEREO | AO_CAP_MIXER_VOL | AO_CAP_MUTE_VOL;
-    this->bytes_per_frame = this->num_channels * (bits / 8);
+    ao_jack_close (this_gen);
+  }
+
+
+  this->mode = mode;
+  this->input_sample_rate = rate;
+  this->bits_per_sample = bits;
+  this->bytes_in_buffer = 0;
+  this->read_pos = this->write_pos = 0;
+  this->paused = 0;
+  this->underrun = 0;
+
+  /*
+   * set number of channels / a52 passthrough
+   */
+  switch (mode) {
+  case AO_CAP_MODE_MONO:
+    this->num_channels = 1;
+    break;
+  case AO_CAP_MODE_STEREO:
+    this->num_channels = 2;
+    break;
+  case AO_CAP_MODE_4CHANNEL:
+    this->num_channels = 4;
+    break;
+  case AO_CAP_MODE_4_1CHANNEL:
+  case AO_CAP_MODE_5CHANNEL:
+  case AO_CAP_MODE_5_1CHANNEL:
+    this->num_channels = 6;
+    break;
+  case AO_CAP_MODE_A52:
+  case AO_CAP_MODE_AC5:
+    /* FIXME: Is this correct...? */
+    this->num_channels = 2;
+    xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	     "ao_jack_open: AO_CAP_MODE_A52\n");
+    break;
+  default:
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "ao_jack_open: JACK Driver does not support the requested mode: 0x%X\n",
+	     mode);
+    return 0;
+  }
+
+  xprintf (this->xine, XINE_VERBOSITY_LOG,
+	   "ao_jack_open: %d channels output\n", this->num_channels);
+  this->bytes_per_frame = (this->bits_per_sample * this->num_channels) / 8;
 
-    fprintf(stderr, "ao_jack_open: bits=%d rate=%d, mode=%d OK\n", bits, rate, mode);
+  /*
+   * open audio device
+   */
+  if (!jack_open_device (this_gen, jack_device, &(this->output_sample_rate),
+			 this->num_channels))
+    return 0;
+
+  if (this->input_sample_rate != this->output_sample_rate) {
+    xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	     "ao_jack_open: audio rate : %d requested, %d provided by device\n",
+	     this->input_sample_rate, this->output_sample_rate);
+  }
 
-    return rate;
+  return this->output_sample_rate;
 }
 
 
-static int ao_jack_num_channels(ao_driver_t *this_gen)
+static int ao_jack_num_channels (ao_driver_t *this_gen)
 {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-    return this->num_channels;
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  return this->num_channels;
 }
 
-static int ao_jack_bytes_per_frame(ao_driver_t *this_gen)
+static int ao_jack_bytes_per_frame (ao_driver_t *this_gen)
 {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-    return this->bytes_per_frame;
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  return this->bytes_per_frame;
 }
 
 static int ao_jack_get_gap_tolerance (ao_driver_t *this_gen)
 {
-    return GAP_TOLERANCE;
+  return GAP_TOLERANCE;
 }
 
-static int last_write_space = 0;
-
-static int ao_jack_write(ao_driver_t *this_gen, int16_t *data,
-                         uint32_t num_frames)
+/*
+ * Return the number of outstanding frames in all output buffers
+ * need to account for ring buffer plus Jack, plus soundcard
+ */
+static int ao_jack_delay (ao_driver_t *this_gen)
 {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-    uint32_t frame, channel;
-
-    uint32_t local_buf_read = this->buf_read;
-    uint32_t local_buf_write = this->buf_write;
-    uint32_t space = (local_buf_read + BUFSIZE - local_buf_write - 1) % BUFSIZE;    
-    uint32_t first_frame = 0;
-
-    int c = 0;
-    while (space < num_frames) {
-	if (++c == 10) return 0;
-	usleep(10000);
-	local_buf_read = this->buf_read;
- 	space = (local_buf_read + BUFSIZE - local_buf_write - 1) % BUFSIZE; 
-    }
-	
-//    if (space < num_frames) return 0;
-
-//    printf("ao_jack_write: %u frames on %u channels, space is %u\n", num_frames, this->num_channels, space);
-    last_write_space = space;
-
-    for (frame = first_frame; frame < num_frames; ++frame) {
-	for (channel = 0; channel < this->num_channels; ++channel) {
-	    float *buf = (channel ? this->buf_2 : this->buf_1);
-	    int16_t sample = data[frame * this->num_channels + channel];
-	    buf[local_buf_write] = ((float)sample) / 32767.0f;
-//	    printf("%6f ", buf[local_buf_write]);
-//	    if (++c == 8) { printf("\n"); c = 0; }
-	}
-	if (++local_buf_write == BUFSIZE) local_buf_write = 0;
-    }
-
-    this->buf_write = local_buf_write;
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  int frames_played = jack_frames_since_cycle_start (this->client);
 
-//    printf("ao_jack_write: buf_read %u, buf_write %u\n", this->buf_read, this->buf_write);
+  int delay = 0;
+  /* Ring Buffer always stores floats */
+  /* TODO: Unsure if the delay should be fragment_size*2 or *3? */
+  delay = buf_used (this) / (sizeof (float) * this->num_channels) +
+	  this->fragment_size * 3 - frames_played;
 
-    return 1;
+  return delay;
 }
 
-static int ao_jack_delay (ao_driver_t *this_gen)
+ /* Write audio samples
+  * num_frames is the number of audio frames present
+  * audio frames are equivalent one sample on each channel.
+  * I.E. Stereo 16 bits audio frames are 4 bytes.
+  * MUST SIMULATE BLOCKING WRITES
+  */
+static int ao_jack_write (ao_driver_t *this_gen, int16_t *frame_buffer,
+			  uint32_t num_frames)
 {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  int written = 0;
+  int num_bytes = num_frames * this->bytes_per_frame;
+
+  /* First try and write all the bytes in one go */
+  this->underrun = 0;
+  /* TODO: In the future Xine should pass only floats to us, so no conversion needed */
+  if (this->bits_per_sample == 16)
+    written = write_buffer_16 (this, (char *) frame_buffer, num_bytes);
+  else if (this->bits_per_sample == 32)
+    written = write_buffer_32 (this, (char *) frame_buffer, num_bytes);
+
+  /* If this fails then need to spin and keep trying until everything written */
+  int spin_count = 0;
+  while ((written < num_bytes) && (spin_count < 40)) {
+    num_bytes -= written;
+    frame_buffer += written / 2;
+
+    /* Sleep to save CPU */
+    int until_callback =
+      this->fragment_size - jack_frames_since_cycle_start (this->client);
+    if ((until_callback < 0) || (until_callback > this->fragment_size)) {
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	       "ao_jack_write: Invalid until_callback %d\n", until_callback);
+      until_callback = this->fragment_size;
+    }
+    xine_usec_sleep (((until_callback +
+		       100) * 1000.0 * 1000.0) / this->output_sample_rate);
 
-    uint32_t local_buf_read = this->buf_read;
-    uint32_t local_buf_write = this->buf_write;
+    if (this->bits_per_sample == 16)
+      written = write_buffer_16 (this, (char *) frame_buffer, num_bytes);
+    else if (this->bits_per_sample == 32)
+      written = write_buffer_32 (this, (char *) frame_buffer, num_bytes);
 
-    int delay = 0;
+    if (written == 0)
+      spin_count++;
+    else
+      spin_count = 0;
 
-    if (local_buf_write > local_buf_read) {
-        delay = local_buf_write - local_buf_read;
-    } else {
-        delay = ((local_buf_write + BUFSIZE - local_buf_read) % BUFSIZE);
-    }
+    if (written == 0)
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	       "ao_jack_write: unusual, couldn't write anything\n");
+  };
 
-    return delay;// - jack_get_buffer_size(this->client);
-}
+  if (spin_count)
+    xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+	     "Nonzero spin_count...%d\n", spin_count);
 
-static void ao_jack_close(ao_driver_t *this_gen)
-{
-    // nothing
+  return spin_count ? 0 : 1;	/* return 1 on success, 0 if we got stuck for some reason */
 }
 
-static uint32_t ao_jack_get_capabilities (ao_driver_t *this_gen) {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-    return this->capabilities;
-}
-
-static void ao_jack_exit(ao_driver_t *this_gen)
+static uint32_t ao_jack_get_capabilities (ao_driver_t *this_gen)
 {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-    jack_client_t *client = this->client;
-    ao_jack_close(this_gen);
-    this->client = 0;
-    if (client) jack_client_close(client);
-    free (this);
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+  return this->capabilities;
 }
 
-static int ao_jack_get_property (ao_driver_t *this_gen, int property) {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-
-    switch(property) {
-    case AO_PROP_PCM_VOL:
-    case AO_PROP_MIXER_VOL:
-//	printf("ao_jack_get_property(AO_PROP_MIXER_VOL): %u\n", this->volume);
-	return this->volume;
-	break;
-    case AO_PROP_MUTE_VOL:
-//	printf("ao_jack_get_property(AO_PROP_MUTE_VOL): %u\n", this->mute);
-	return this->mute;
-	break;
-    }
+static void ao_jack_exit (ao_driver_t *this_gen)
+{
+  jack_driver_t *this = (jack_driver_t *) this_gen;
 
-    return 0;
+  ao_jack_close (this_gen);
+  if (this->buffer)
+    free (this->buffer);
+  free (this);
 }
 
-static int ao_jack_set_property (ao_driver_t *this_gen, int property, int value) {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
-
-    switch(property) {
-    case AO_PROP_PCM_VOL:
-    case AO_PROP_MIXER_VOL:
-//	printf("ao_jack_set_property(AO_PROP_MIXER_VOL): %u\n", value);
-	this->volume = value;
-	break;
-    case AO_PROP_MUTE_VOL:
-//	printf("ao_jack_get_property(AO_PROP_MUTE_VOL): %u\n", value);
-	this->mute = value;
-	break;
-    }
+static int ao_jack_get_property (ao_driver_t *this_gen, int property)
+{
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+
+  switch (property) {
+  case AO_PROP_PCM_VOL:
+  case AO_PROP_MIXER_VOL:
+    return this->mixer.volume;
+    break;
+  case AO_PROP_MUTE_VOL:
+    return this->mixer.mute;
+    break;
+  }
+
+  return 0;
+}
 
-    return ~value;
+static int ao_jack_set_property (ao_driver_t *this_gen, int property, int value)
+{
+  jack_driver_t *this = (jack_driver_t *) this_gen;
+
+  switch (property) {
+  case AO_PROP_PCM_VOL:
+  case AO_PROP_MIXER_VOL:
+    this->mixer.volume = value;
+    return value;
+    break;
+  case AO_PROP_MUTE_VOL:
+    this->mixer.mute = value;
+    return value;
+    break;
+  }
+
+  return -1;
 }
 
-static int ao_jack_ctrl(ao_driver_t *this_gen, int cmd, ...) {
-    jack_driver_t *this = (jack_driver_t *) this_gen;
+static int ao_jack_ctrl (ao_driver_t *this_gen, int cmd, ...)
+{
+  jack_driver_t *this = (jack_driver_t *) this_gen;
 
-    switch (cmd) {
+  switch (cmd) {
 
-    case AO_CTRL_PLAY_PAUSE:
-	break;
+  case AO_CTRL_PLAY_PAUSE:
+    this->paused = 1;
+    break;
 
-    case AO_CTRL_PLAY_RESUME:
-	break;
+  case AO_CTRL_PLAY_RESUME:
+    this->paused = 0;
+    break;
 
-    case AO_CTRL_FLUSH_BUFFERS:
-//	fprintf(stderr, "ao_jack_ctrl(AO_CTRL_FLUSH_BUFFERS)\n");
-	this->buf_write = this->buf_read = 0;
-	break;
-    }
+  case AO_CTRL_FLUSH_BUFFERS:
+    jack_reset (this);
+    break;
+  }
 
-    return 0;
+  return 0;
 }
 
+static void jack_speaker_arrangement_cb (void *user_data,
+					 xine_cfg_entry_t *entry);
+
 static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen,
 				      const void *data)
 {
-    jack_class_t  *class = (jack_class_t *) class_gen;
-    jack_driver_t *this;
-    jack_client_t *client;
-    uint32_t rate;
-    const char **port_names;
-    int i;
-
-    if ((client = jack_client_new("xine")) == 0) {
-
-	char name[20];
-	sprintf(name, "xine (%d)", (int)getpid());
-
-	if ((client = jack_client_new(name)) == 0) {
-	    fprintf(stderr, "\nopen_jack_plugin: Error: Failed to connect to JACK server\n");
-	    fprintf(stderr, "open_jack_plugin: (did you start 'jackd' server?)\n");
-	    return 0;
-	}
-    }
-
-    this = calloc(1, sizeof (jack_driver_t));
-    
-    this->client = client;
-
-    jack_set_process_callback(client, jack_process, this);
-    jack_on_shutdown(client, jack_shutdown, this);
-
-    rate = jack_get_sample_rate(client);
-    fprintf(stderr, "open_jack_plugin: JACK sample rate is %u\n", rate);
-
-    // We support up to 2-channel output
-
-    for (i = 0; i < 2; ++i) {
-	jack_port_t *port = jack_port_register
-	    (client, (i ? "out_r" : "out_l"),
-	     JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-	if (!port) {
-	    fprintf(stderr, "ao_jack_open: failed to register port %u\n", i);
-	}
-	if (i) this->port_2 = port;
-	else   this->port_1 = port;
-    }
-
-    this->buf_read = this->buf_write = 0;
-    this->volume = 100;
-    this->mute = 0;
-
-    if (jack_activate(client)) {
-	fprintf(stderr, "ao_jack_open: failed to activate JACK client\n");
-	return 0;
-    }
-
-    if ((port_names = jack_get_ports(client, NULL, NULL,
-				     JackPortIsPhysical | JackPortIsInput)) != NULL) {
-	if (port_names[0]) {
-	    jack_connect(client, jack_port_name(this->port_1), port_names[0]);
-	}
-	if (port_names[1] && this->port_2) {
-	    jack_connect(client, jack_port_name(this->port_2), port_names[1]);
-	}
-	free(port_names);
+  jack_class_t *class = (jack_class_t *) class_gen;
+  config_values_t *config = class->config;
+  jack_driver_t *this;
+
+  jack_client_t *client;
+  uint32_t rate;
+  char *jack_device;
+  const char **matching_ports = NULL;
+  const char **port_names;
+
+  /* for usability reasons, keep this in sync with audio_oss_out.c */
+  static char *speaker_arrangement[] = {
+    "Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1",
+    "Surround 3.0", "Surround 4.0", "Surround 4.1", "Surround 5.0",
+    "Surround 5.1", "Surround 6.0",
+    "Surround 6.1", "Surround 7.1", "Pass Through", NULL
+  };
+#define MONO		0
+#define STEREO		1
+#define HEADPHONES	2
+#define SURROUND21	3
+#define SURROUND3	4
+#define SURROUND4	5
+#define SURROUND41	6
+#define SURROUND5	7
+#define SURROUND51	8
+#define SURROUND6	9
+#define SURROUND61	10
+#define SURROUND71	11
+#define A52_PASSTHRU	12
+  int speakers;
+
+  /* Try to create a client called "xine" */
+  if ((client = jack_client_new ("xine")) == 0) {
+    /* If that doesn't work it could be because running two copies of xine - try using a unique name */
+    char name[20];
+    sprintf (name, "xine (%d)", (int) getpid ());
+
+    if ((client = jack_client_new (name)) == 0) {
+      xprintf (class->xine, XINE_VERBOSITY_LOG,
+	       "\nopen_jack_plugin: Error: Failed to connect to JACK server\n");
+      xprintf (class->xine, XINE_VERBOSITY_LOG,
+	       "open_jack_plugin: (did you start 'jackd' server?)\n");
+      return 0;
     }
+  }
+
+  this = calloc(1, sizeof (jack_driver_t));
+
+  rate = jack_get_sample_rate (client);
+  xprintf (class->xine, XINE_VERBOSITY_DEBUG,
+	   "open_jack_plugin: JACK sample rate is %u\n", rate);
+
+  /* devname_val is offset used to select auto, /dev/dsp, or /dev/sound/dsp */
+  jack_device = config->register_string (config,
+					 "audio.device.jack_device_name",
+					 "",
+					 _("JACK audio device name"),
+					 _("Specifies the jack audio device name, "
+					   "leave blank for the default physical output port."),
+					 10, NULL, NULL);
+
+  this->capabilities = 0;
+
+
+  /* for usability reasons, keep this in sync with audio_alsa_out.c */
+  speakers =
+    config->register_enum (config, "audio.output.speaker_arrangement",
+			   STEREO, speaker_arrangement,
+			   _("speaker arrangement"),
+			   _("Select how your speakers are arranged, "
+			     "this determines which speakers xine uses for sound output. "
+			     "The individual values are:\n\n"
+			     "Mono 1.0: You have only one speaker.\n"
+			     "Stereo 2.0: You have two speakers for left and right channel.\n"
+			     "Headphones 2.0: You use headphones.\n"
+			     "Stereo 2.1: You have two speakers for left and right channel, and one "
+			     "subwoofer for the low frequencies.\n"
+			     "Surround 3.0: You have three speakers for left, right and rear channel.\n"
+			     "Surround 4.0: You have four speakers for front left and right and rear "
+			     "left and right channels.\n"
+			     "Surround 4.1: You have four speakers for front left and right and rear "
+			     "left and right channels, and one subwoofer for the low frequencies.\n"
+			     "Surround 5.0: You have five speakers for front left, center and right and "
+			     "rear left and right channels.\n"
+			     "Surround 5.1: You have five speakers for front left, center and right and "
+			     "rear left and right channels, and one subwoofer for the low frequencies.\n"
+			     "Surround 6.0: You have six speakers for front left, center and right and "
+			     "rear left, center and right channels.\n"
+			     "Surround 6.1: You have six speakers for front left, center and right and "
+			     "rear left, center and right channels, and one subwoofer for the low frequencies.\n"
+			     "Surround 7.1: You have seven speakers for front left, center and right, "
+			     "left and right and rear left and right channels, and one subwoofer for the "
+			     "low frequencies.\n"
+			     "Pass Through: Your sound system will receive undecoded digital sound from xine. "
+			     "You need to connect a digital surround decoder capable of decoding the "
+			     "formats you want to play to your sound card's digital output."),
+			   0, jack_speaker_arrangement_cb, this);
+
+  int port_flags = JackPortIsInput;
+  int num_ports;
+  /* list matching ports */
+  if (!jack_device)
+    port_flags |= JackPortIsPhysical;
+  /* Find all the ports matching either the desired device regexp or physical output ports */
+  matching_ports = jack_get_ports (client, jack_device, NULL, port_flags);
+  /* Count 'em */
+  for (num_ports = 0; matching_ports && matching_ports[num_ports];
+       num_ports++)
+    /**/;
+  if (!num_ports) {
+    xprintf (this->xine, XINE_VERBOSITY_LOG,
+	     "open_jack_plugin: no physical ports available\n");
+    goto err_out;
+  }
+
+
+/* TODO: We deliberately don't offer mono, let Xine upsample instead? */
+/*  if (num_ports >= 1) { */
+/*    this->capabilities |= AO_CAP_MODE_MONO; */
+/*    xprintf(class->xine, XINE_VERBOSITY_DEBUG, "mono "); */
+/*  } */
+
+  if (num_ports >= 2) {
+    this->capabilities |= AO_CAP_MODE_STEREO;
+    xprintf (class->xine, XINE_VERBOSITY_DEBUG, "stereo ");
+  }
+
+  if (num_ports >= 4) {
+    if (speakers == SURROUND4) {
+      this->capabilities |= AO_CAP_MODE_4CHANNEL;
+      xprintf (class->xine, XINE_VERBOSITY_DEBUG, "4-channel ");
+    } else
+      xprintf (class->xine, XINE_VERBOSITY_DEBUG,
+	       "(4-channel not enabled in xine config) ");
+  }
+
+  if (num_ports >= 5) {
+    if (speakers == SURROUND5) {
+      this->capabilities |= AO_CAP_MODE_5CHANNEL;
+      xprintf (class->xine, XINE_VERBOSITY_DEBUG, "5-channel ");
+    } else
+      xprintf (class->xine, XINE_VERBOSITY_DEBUG,
+	       "(5-channel not enabled in xine config) ");
+  }
+
+  if (num_ports >= 6) {
+    if (speakers == SURROUND51) {
+      this->capabilities |= AO_CAP_MODE_5_1CHANNEL;
+      xprintf (class->xine, XINE_VERBOSITY_DEBUG, "5.1-channel ");
+    } else
+      xprintf (class->xine, XINE_VERBOSITY_DEBUG,
+	       "(5.1-channel not enabled in xine config) ");
+  }
+
+  this->buffer = (unsigned char *) malloc (BUFFSIZE);
+  jack_reset (this);
+
+  this->capabilities |= AO_CAP_MIXER_VOL;
+  this->capabilities |= AO_CAP_MUTE_VOL;
+  /* TODO: Currently not respected by Xine, perhaps v1.2? */
+  this->capabilities |= AO_CAP_FLOAT32;
+
+
+  this->mixer.mute = 0;
+  this->mixer.volume = 100;
+
+  this->output_sample_rate = jack_get_sample_rate (client);
+  this->fragment_size = jack_get_buffer_size (client);
+
+  /* Close our JACK client */
+  jack_client_close (client);
+
+  this->xine = class->xine;
+
+  this->ao_driver.get_capabilities	= ao_jack_get_capabilities;
+  this->ao_driver.get_property		= ao_jack_get_property;
+  this->ao_driver.set_property		= ao_jack_set_property;
+  this->ao_driver.open			= ao_jack_open;
+  this->ao_driver.num_channels		= ao_jack_num_channels;
+  this->ao_driver.bytes_per_frame	= ao_jack_bytes_per_frame;
+  this->ao_driver.delay			= ao_jack_delay;
+  this->ao_driver.write			= ao_jack_write;
+  this->ao_driver.close			= ao_jack_close;
+  this->ao_driver.exit			= ao_jack_exit;
+  this->ao_driver.get_gap_tolerance	= ao_jack_get_gap_tolerance;
+  this->ao_driver.control		= ao_jack_ctrl;
+
+  return &this->ao_driver;
+
+err_out:
+  free (matching_ports);
+  if (client)
+    jack_client_close (client);
+  return 0;
+}
 
-    this->sample_rate = rate;
-
-    this->xine = class->xine;
-    this->capabilities = AO_CAP_FLOAT32 | AO_CAP_MODE_MONO | 
-	AO_CAP_MODE_STEREO | AO_CAP_MIXER_VOL | AO_CAP_MUTE_VOL;
-
-    this->ao_driver.get_capabilities    = ao_jack_get_capabilities;
-    this->ao_driver.get_property        = ao_jack_get_property;
-    this->ao_driver.set_property        = ao_jack_set_property;
-    this->ao_driver.open                = ao_jack_open;
-    this->ao_driver.num_channels        = ao_jack_num_channels;
-    this->ao_driver.bytes_per_frame     = ao_jack_bytes_per_frame;
-    this->ao_driver.delay               = ao_jack_delay;
-    this->ao_driver.write               = ao_jack_write;
-    this->ao_driver.close               = ao_jack_close;
-    this->ao_driver.exit                = ao_jack_exit;
-    this->ao_driver.get_gap_tolerance   = ao_jack_get_gap_tolerance;
-    this->ao_driver.control             = ao_jack_ctrl;
-
-    fprintf(stderr, "jack open_jack_plugin returning %p\n", (void *)(&this->ao_driver));
-    return &this->ao_driver;
+static void jack_speaker_arrangement_cb (void *user_data,
+					 xine_cfg_entry_t *entry)
+{
+  jack_driver_t *this = (jack_driver_t *) user_data;
+  int32_t value = entry->num_value;
+  if (value == SURROUND4) {
+    this->capabilities |= AO_CAP_MODE_4CHANNEL;
+  } else {
+    this->capabilities &= ~AO_CAP_MODE_4CHANNEL;
+  }
+  if (value == SURROUND41) {
+    this->capabilities |= AO_CAP_MODE_4_1CHANNEL;
+  } else {
+    this->capabilities &= ~AO_CAP_MODE_4_1CHANNEL;
+  }
+  if (value == SURROUND5) {
+    this->capabilities |= AO_CAP_MODE_5CHANNEL;
+  } else {
+    this->capabilities &= ~AO_CAP_MODE_5CHANNEL;
+  }
+  if (value >= SURROUND51) {
+    this->capabilities |= AO_CAP_MODE_5_1CHANNEL;
+  } else {
+    this->capabilities &= ~AO_CAP_MODE_5_1CHANNEL;
+  }
 }
 
 /*
@@ -416,9 +929,7 @@ static void *init_class (xine_t *xine, void *data) {
     return this;
 }
 
-static ao_info_t ao_info_jack = {
-    6
-};
+static ao_info_t ao_info_jack = { 6 };
 
 /*
  * exported plugin catalog entry
@@ -429,4 +940,3 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
     { PLUGIN_AUDIO_OUT, AO_OUT_JACK_IFACE_VERSION, "jack", XINE_VERSION_CODE /* XINE_VERSION_CODE */, &ao_info_jack, init_class },
     { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
-
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 128f730d3..4ec7544a5 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -877,10 +877,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   if (this->sync_method == OSS_SYNC_PROBEBUFFER) {
     char *buf;
     int c;
-  
-    xprintf(class->xine, XINE_VERBOSITY_LOG,
-	    _("audio_oss_out: Audio driver realtime sync disabled...\n"
-	      "audio_oss_out: ...probing output buffer size: "));
+
     this->buffer_size = 0;
     
     if( (buf=calloc(1, 1024)) != NULL ) {
@@ -894,7 +891,8 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
     }
     close(audio_fd);
     xprintf(class->xine, XINE_VERBOSITY_LOG,
-	    _("%d bytes\naudio_oss_out: ...there may be audio/video synchronization issues\n"), this->buffer_size);
+	    _("audio_oss_out: Audio driver realtime sync disabled...\n"
+	      "audio_oss_out: ...probing output buffer size: %d bytes\naudio_oss_out: ...there may be audio/video synchronization issues\n"), this->buffer_size);
 
     audio_fd=open(this->audio_dev, O_WRONLY|O_NONBLOCK);
 
@@ -957,48 +955,48 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 			0, oss_speaker_arrangement_cb, this);
 
 
-  xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: supported modes are ");
+  char *logmsg = strdup (_("audio_oss_out: supported modes are"));
   num_channels = 1; 
   status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
   if ( (status != -1) && (num_channels==1) ) {
     this->capabilities |= AO_CAP_MODE_MONO;
-    xprintf(class->xine, XINE_VERBOSITY_DEBUG, "mono ");
+    xine_strcat_realloc (&logmsg, _(" mono"));
   }
   num_channels = 2; 
   status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
   if ( (status != -1) && (num_channels==2) ) {
     this->capabilities |= AO_CAP_MODE_STEREO;
-    xprintf(class->xine, XINE_VERBOSITY_DEBUG, "stereo ");
+    xine_strcat_realloc (&logmsg, _(" stereo"));
   }
   num_channels = 4; 
   status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
   if ( (status != -1) && (num_channels==4) )  {
     if  ( speakers == SURROUND4 ) {
       this->capabilities |= AO_CAP_MODE_4CHANNEL;
-      xprintf(class->xine, XINE_VERBOSITY_DEBUG, "4-channel ");
+      xine_strcat_realloc (&logmsg, _(" 4-channel"));
     } 
     else
-      xprintf(class->xine, XINE_VERBOSITY_DEBUG, "(4-channel not enabled in xine config) " );
+      xine_strcat_realloc (&logmsg, _(" (4-channel not enabled in xine config)"));
   }
   num_channels = 5; 
   status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
   if ( (status != -1) && (num_channels==5) ) {
     if  ( speakers == SURROUND5 ) {
       this->capabilities |= AO_CAP_MODE_5CHANNEL;
-      xprintf(class->xine, XINE_VERBOSITY_DEBUG, "5-channel ");
+      xine_strcat_realloc (&logmsg, _(" 5-channel"));
     }
     else
-      xprintf(class->xine, XINE_VERBOSITY_DEBUG, "(5-channel not enabled in xine config) " );
+      xine_strcat_realloc (&logmsg, _(" (5-channel not enabled in xine config)"));
   }
   num_channels = 6; 
   status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); 
   if ( (status != -1) && (num_channels==6) ) {
     if  ( speakers == SURROUND51 ) {
       this->capabilities |= AO_CAP_MODE_5_1CHANNEL;
-      xprintf(class->xine, XINE_VERBOSITY_DEBUG, "5.1-channel ");
+      xine_strcat_realloc (&logmsg, _(" 5.1-channel"));
     } 
     else
-      xprintf(class->xine, XINE_VERBOSITY_DEBUG, "(5.1-channel not enabled in xine config) " );
+      xine_strcat_realloc (&logmsg, _(" (5.1-channel not enabled in xine config)"));
   }
 
   ioctl(audio_fd,SNDCTL_DSP_GETFMTS,&caps);
@@ -1008,10 +1006,13 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   if  ( speakers == A52_PASSTHRU ) {
     this->capabilities |= AO_CAP_MODE_A52;
     this->capabilities |= AO_CAP_MODE_AC5;
-    xprintf(class->xine, XINE_VERBOSITY_DEBUG, "a/52-pass-through ");
+    xine_strcat_realloc (&logmsg, _(" a/52 pass-through"));
   } 
   else 
-    xprintf(class->xine, XINE_VERBOSITY_DEBUG, "(a/52-pass-through not enabled in xine config)");
+    xine_strcat_realloc (&logmsg, _(" (a/52 pass-through not enabled in xine config)"));
+
+  xprintf(class->xine, XINE_VERBOSITY_DEBUG, "%s\n", logmsg);
+  free (logmsg);
   
   /*
    * mixer initialisation.
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 2c896c6ae..b5ca5c59e 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -3144,7 +3144,9 @@ static void *init_plugin (xine_t *xine, void *data) {
     "video/quicktime: mov,qt: Quicktime animation;"
     "video/x-quicktime: mov,qt: Quicktime animation;"
     "audio/x-m4a: m4a,m4b: MPEG-4 audio;"
-    "application/x-quicktimeplayer: qtl: Quicktime list;";
+    "application/x-quicktimeplayer: qtl: Quicktime list;"
+    "video/mp4: mp4,mpg4: MPEG-4 video;"
+    "audio/mp4: mp4,mpg4: MPEG-4 audio;";
   this->demux_class.extensions      = "mov qt mp4 m4a m4b";
   this->demux_class.dispose         = default_demux_class_dispose;
 
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 3d9939f91..59e5b8fb2 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -724,3 +724,11 @@ int xine_monotonic_clock(struct timeval *tv, struct timezone *tz)
 
 #endif
 }
+
+char *xine_strcat_realloc (char **dest, char *append)
+{
+  char *newstr = realloc (*dest, (*dest ? strlen (*dest) : 0) + strlen (append) + 1);
+  if (newstr)
+    strcat (*dest = newstr, append);
+  return newstr;
+}