From 66f1aca41a4ff7668e5c21f59c3b2170d3d265e7 Mon Sep 17 00:00:00 2001 From: Thibaut Mattern Date: Thu, 5 Apr 2007 13:07:13 +0200 Subject: Fixed current audio sync, delay was always 0. Checked snd_pcm_delay return code, and don't trust negative values. --- src/audio_out/audio_alsa_out.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 3651d21da..f176b7594 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -663,15 +663,7 @@ static int ao_alsa_delay (ao_driver_t *this_gen) { struct timeval now; printf("audio_alsa_out:delay:ENTERED\n"); #endif - err=snd_pcm_delay( this->audio_fd, &delay ); - - int state = snd_pcm_state(this->audio_fd); - - /* check for idle states, which need to be handled as delay=0 */ - if(state == SND_PCM_STATE_PREPARED || state == SND_PCM_STATE_PAUSED || - state == SND_PCM_STATE_OPEN || SND_PCM_STATE_XRUN) { - return 0; - } + err = snd_pcm_delay( this->audio_fd, &delay ); #ifdef LOG_DEBUG printf("audio_alsa_out:delay:delay all=%ld err=%d\n",delay, err); @@ -679,8 +671,11 @@ static int ao_alsa_delay (ao_driver_t *this_gen) { printf("audio_alsa_out:delay: Time = %ld.%ld\n", now.tv_sec, now.tv_usec); printf("audio_alsa_out:delay:FINISHED\n"); #endif - return delay; + if (err || (delay < 0)) + delay = 0; + + return delay; } #if 0 -- cgit v1.2.3 From d4c9af94f21cd575bd57da36d489d37812a5610e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 15:31:01 +0200 Subject: Use xineplug_LTLIBRARIES wherever possible. --- src/audio_out/Makefile.am | 4 +--- src/dxr3/Makefile.am | 4 +--- src/input/Makefile.am | 4 +--- src/input/vcd/Makefile.am | 4 +--- src/libspucc/Makefile.am | 4 +--- src/libspudvb/Makefile.am | 4 +--- src/libw32dll/Makefile.am | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index d52f700f3..1329b0f62 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -4,8 +4,6 @@ AM_CPPFLAGS = -DXINE_COMPILE EXTRA_DIST = audio_irixal_out.c -libdir = $(XINE_PLUGINDIR) - if HAVE_OSS oss_module = xineplug_ao_out_oss.la endif @@ -57,7 +55,7 @@ endif # all xine audio out plugins should be named like the # scheme "xineplug_ao_out_" # -lib_LTLIBRARIES = xineplug_ao_out_none.la xineplug_ao_out_file.la \ +xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplug_ao_out_file.la \ $(oss_module) \ $(alsa_module) \ $(sun_module) \ diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 8bf9c9427..5f413f804 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS) -libdir = $(XINE_PLUGINDIR) - if HAVE_DXR3 dxr3_modules = xineplug_decode_dxr3_video.la \ xineplug_decode_dxr3_spu.la \ @@ -19,7 +17,7 @@ if HAVE_LIBRTE link_rte = -lrte endif -lib_LTLIBRARIES = $(dxr3_modules) +xineplug_LTLIBRARIES = $(dxr3_modules) xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 68adf84be..a2a1ea3a4 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -8,8 +8,6 @@ else SUBDIRS = vcd dvb libreal librtsp libdvdnav endif -libdir = $(XINE_PLUGINDIR) - ## # IMPORTANT: # --------- @@ -52,7 +50,7 @@ endif AM_CFLAGS = -D_LARGEFILE64_SOURCE $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS) -lib_LTLIBRARIES = \ +xineplug_LTLIBRARIES = \ xineplug_inp_file.la \ xineplug_inp_http.la \ $(in_dvd) \ diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 98903aac8..16eece779 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -2,14 +2,12 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = libcdio libvcd -libdir = $(XINE_PLUGINDIR) - vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c EXTRA_DIST = $(vcd_SRCS) if ENABLE_VCD -lib_LTLIBRARIES = xineplug_inp_vcd.la +xineplug_LTLIBRARIES = xineplug_inp_vcd.la AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am index ec12c1bc7..aefe4d7c1 100644 --- a/src/libspucc/Makefile.am +++ b/src/libspucc/Makefile.am @@ -1,8 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -libdir = $(XINE_PLUGINDIR) - -lib_LTLIBRARIES = xineplug_decode_spucc.la +xineplug_LTLIBRARIES = xineplug_decode_spucc.la xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_cc_decoder.c xineplug_decode_spucc_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing diff --git a/src/libspudvb/Makefile.am b/src/libspudvb/Makefile.am index b4ae9befe..e385e5553 100644 --- a/src/libspudvb/Makefile.am +++ b/src/libspudvb/Makefile.am @@ -1,8 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -libdir = $(XINE_PLUGINDIR) - -lib_LTLIBRARIES = xineplug_decode_spudvb.la +xineplug_LTLIBRARIES = xineplug_decode_spudvb.la xineplug_decode_spudvb_la_SOURCES = xine_spudvb_decoder.c xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 46027d0f1..358eea40a 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -9,9 +9,7 @@ w32dll_codec = xineplug_decode_w32dll.la qt_codec = xineplug_decode_qt.la endif -libdir = $(XINE_PLUGINDIR) - -lib_LTLIBRARIES = $(w32dll_codec) $(qt_codec) +xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec) EXTRA_DIST = common.c -- cgit v1.2.3 From 217f2b6ec22319c6c01594f0a09e652f3e829a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 15:41:02 +0200 Subject: Regenerate, audio_alsa_out.c changed line numbers. --- po/cs.po | 78 ++++++++++++++++++++++++++++----------------------------- po/de.po | 78 ++++++++++++++++++++++++++++----------------------------- po/es.po | 78 ++++++++++++++++++++++++++++----------------------------- po/eu.po | 78 ++++++++++++++++++++++++++++----------------------------- po/fr.po | 78 ++++++++++++++++++++++++++++----------------------------- po/it.po | 78 ++++++++++++++++++++++++++++----------------------------- po/libxine1.pot | 78 ++++++++++++++++++++++++++++----------------------------- po/pl.po | 78 ++++++++++++++++++++++++++++----------------------------- po/pt_BR.po | 78 ++++++++++++++++++++++++++++----------------------------- po/sk.po | 78 ++++++++++++++++++++++++++++----------------------------- 10 files changed, 390 insertions(+), 390 deletions(-) diff --git a/po/cs.po b/po/cs.po index 876aa5900..b5150c889 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.0.1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2005-12-11 20:47+0100\n" "Last-Translator: František Dvořák \n" "Language-Team: Czech \n" @@ -70,11 +70,11 @@ msgstr "" "audio_alsa_out: přerušena konfigurace tohoto PCM: žádná konfigurace není k " "dispozici: %s\n" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "uvědomit o změnách hardwarový mixer" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " @@ -83,16 +83,16 @@ msgstr "" "Když se změní hardwarový mixer, vaše aplikace obdrží upozornění, a tak může " "za běhu aktualizovat svoji grafickou reprezentaci nastavení mixeru." -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "snd_lib_error_set_handler() selhalo: %d" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "zvuková karta umožňuje provádět mmap" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " @@ -103,11 +103,11 @@ msgstr "" "Můžete to zkusit povolit a zkontrolovat, zda vše funguje. Pokud ano, zlepší " "toto nastavení výkon." -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "zařízení použité pro mono výstup" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." @@ -115,11 +115,11 @@ msgstr "" "xine použije toto zařízení ALSA pro výstup zvuku mono.\n" "Informace o zařízeních ALSA naleznete v dokumentaci k ALSA." -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "zařízení použité pro stereo výstup" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." @@ -127,11 +127,11 @@ msgstr "" "xine použije toto zařízení ALSA pro výstup zvuku stereo.\n" "Informace o zařízeních ALSA naleznete v dokumentaci k ALSA." -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "zařízení použité pro čtyřkanálový výstup" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." @@ -139,11 +139,11 @@ msgstr "" "xine použije toto zařízení ALSA pro výstup surround zvuku 4kanálově (4.0).\n" "Informace o zařízeních ALSA naleznete v dokumentaci k ALSA." -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "zařízení použité pro 5.1-kanálový výstup" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" @@ -153,7 +153,7 @@ msgstr "" "(5.1).\n" "Informace o zařízeních ALSA naleznete v dokumentaci k ALSA." -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" @@ -163,21 +163,21 @@ msgstr "" "Může to být použito vnějšími surround dekodéry.\n" "Informace o zařízeních ALSA naleznete v dokumentaci k ALSA." -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "snd_cm_open() selhalo:%d:%s\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr ">>> Zkontrolujte, jestli už jiný program nepoužívá PCM <<<\n" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "uspořádání reproduktorů" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -236,79 +236,79 @@ msgstr "" "Na digitální výstup vaší zvukové karty potřebujete připojit digitální " "surround dekodér schopný dekódovat formáty, které chcete přehrát." -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "audio_alsa_out : podporované režimy jsou " -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "8bitový" -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "16bitový" -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "24bitový" -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "32bitový" -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "mono" -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "stereo" -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "4kanálový" -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "(4kanálový není povolen v konfiguraci xine)" -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "4.1kanálový" -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 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:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "5kanálový" -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "(5kanálový není povolen v kondifuraci xine)" -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "5.1kanálový" -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 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:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "a/52 a DTS pass-through\n" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 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" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "mixovací zařízení alsa" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." @@ -316,7 +316,7 @@ msgstr "" "ke změně hlasitosti použije xine toto zařízení mixeru ALSA.\n" "Informace o zařízeních ALSA nalzeznete v dokumentaci k ALSA." -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače alsa" diff --git a/po/de.po b/po/de.po index 5f08078ec..3934b36bb 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.1.5\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2007-02-13 09:28+0100\n" "Last-Translator: Philipp Hahn \n" "Language-Team: German \n" @@ -64,11 +64,11 @@ msgstr "" "audio_alsa_out: Kaputte Konfiguration für dieses PCM: Keine Konfiguration " "verfügbar: %s\n" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "Änderungen an Hardwaremixer melden" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " @@ -78,16 +78,16 @@ msgstr "" "benachrichtigt, damit sie die grafische Darstellung des Mixers direkt " "aktualisieren kann." -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "snd_lib_error_set_handler() schlug fehl: %d" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "Soundkarte unterstützt mmap " -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " @@ -98,11 +98,11 @@ msgstr "" "Sie können dies aktivieren und testen, ob alles funktioniert. Falls ja, " "erhöht es die Leistung." -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "Gerät für Monoausgabe" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." @@ -110,11 +110,11 @@ msgstr "" "xine benutzt diese ALSA-Gerät für die Monoausgabe.\n" "Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten." -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "Gerät für Stereoausgabe" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." @@ -122,11 +122,11 @@ msgstr "" "xine benutzt diese ALSA-Gerät für die Stereoausgabe.\n" "Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten." -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "Gerät für 4-Kanalausgabe" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." @@ -134,11 +134,11 @@ msgstr "" "xine benutzt diese ALSA-Gerät für die 4-Kanalausgabe (4.0 Raumklang).\n" "Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten." -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "Gerät für 5.1-Kanalausgabe" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" @@ -148,7 +148,7 @@ msgstr "" "Raumklang).\n" "Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten." -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" @@ -158,21 +158,21 @@ msgstr "" "Raumklang. Dies kann von externen Dekodern benutzt werden.\n" "Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten." -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "snd_pcm_open() schlug fehl:%d:%s\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr ">>> Überprüfen Sie, ob ein anderen Programm bereis PCM benutzt <<<\n" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "Lautsprecherplazierung" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -233,79 +233,79 @@ msgstr "" "Sie benötigen einen digitalen Raumklangdekoder, der alle Formate dekodieren " "kann, die Sie über den digitalen Ausgang Ihrer Soundkarte abspielen wollen." -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "audio_alsa_out : Unterstützte Modi sind " -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "8Bit " -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "16Bit " -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "24Bit " -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "32Bit " -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "Mono " -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "Stereo " -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "4-Kanal " -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "(4-Kanal nicht aktiviert in xine Konfiguration) " -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "4.1-Kanal " -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 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:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "5-Kanal " -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "(5-Kanal nicht aktiviert in xine Konfiguration) " -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "5.1-Kanal " -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 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:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "a/52 und DTS pass-through\n" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 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" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "ALSA Mixergerät" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." @@ -313,7 +313,7 @@ msgstr "" "xine benutzt dieses ALSA Mixergerät, um die Lautstärke zu ändern.\n" "Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten." -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "xine Soundausgabe benutzt ALSA-kompatibles Gerät/Treiber" diff --git a/po/es.po b/po/es.po index 95b9d40e7..5f565777e 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib-1.1.4\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2007-02-28 14:07+0100\n" "Last-Translator: Carlos E. Robinson M. \n" "Language-Team: Spanish\n" @@ -73,11 +73,11 @@ msgstr "" "audio_alsa_out: configuración rota para éste PCM: no hay configuraciones " "disponibles: %s\n" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "notificar cambios al mezclador en hardware" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " @@ -87,16 +87,16 @@ msgstr "" "notificiación de modo que pueda actualizar su representación gráfica de los " "ajustes del mezclador al vuelo." -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "snd_lib_error_set_handler() falló: %d" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "la tarjeta de sonido puede hacer mmap" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " @@ -107,11 +107,11 @@ msgstr "" "Puede probar a activarlo y verficar, si todo funciona. Si lo hace, esto " "aumentará el rendimiento." -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "dispositivo usado para salida mono" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." @@ -119,11 +119,11 @@ msgstr "" "xine usará éste dispositivo para generar sonido monofónico.\n" "Vea la documentación de alsa para información de dispositivos alsa." -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "dispositivo usado para salida estéreo" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." @@ -131,11 +131,11 @@ msgstr "" "xine usará este dispositivo alsa para la salida de sonido estereo.\n" "Vea la documentación de alsa para información de dispositivos alsa." -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "dispositivo usado para salida de cuatro canales" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." @@ -144,11 +144,11 @@ msgstr "" "canales (4.0).\n" "Vea la documentación de alsa para información de dispositivos alsa." -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "dispositivo usado para salida de 5.1 canales" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" @@ -158,7 +158,7 @@ msgstr "" "canales más LFE (5.1).\n" "Vea la documentación de alsa para información de dispositivos alsa." -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" @@ -168,21 +168,21 @@ msgstr "" "sin decodificar. Esto puede usarse en decodificadores envolventes externos.\n" "Vea la documentación de alsa para información de dispositivos alsa." -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "snd_pcm_open() falló:%d:%s\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr ">>> Comprobar si otro programa está ya usando PCM <<<\n" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "disposición de altavoces" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -246,79 +246,79 @@ msgstr "" "decodificar los formatos que quiera reproducir mediate la salida digital de " "su tarjeta de sonido." -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "audio_alsa_out : los modos soportados son " -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "8bit " -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "16bit " -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "24bit " -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "32bit " -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "mono " -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "estéreo " -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "4-canales " -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 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:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "4.1-canales " -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 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:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "5-canales " -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 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:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "5.1-canales " -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 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:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "travesía a/52 y DTS\n" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 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" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "dispositivo mezclador alsa" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." @@ -326,7 +326,7 @@ msgstr "" "xine usará este dispositivo mezclador alsa para cambiar el volumen.\n" "Vea la documentación de alsa para información de dispositivos alsa." -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" "complemento de xine de salida de audio usando dispositvos/drivers " diff --git a/po/eu.po b/po/eu.po index a9ab5850d..c148ef600 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib-1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2005-02-17 14:29+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: lubrezale \n" @@ -67,11 +67,11 @@ msgstr "" "audio_alsa_out: PCM onentzat apurturiko konfigurazioa: Ez dago konfigurazio " "erabilgarririk: %s\n" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "hardware nahasleari aldaketen berri eman" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " @@ -80,16 +80,16 @@ msgstr "" "Hardware nahaslea aldatzerakoan, zure aplikazioak honen berri jasoko du eta " "nahaslearen irudi grafikoa denbora errealean eraldatuko du." -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "snd_lib_error_set_handler() hutsa: %d" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "soinu txartelak mmap egin dezake" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " @@ -100,11 +100,11 @@ msgstr "" "Gaitu eta frogaru dezakezu beldurrik gabe, denak behar bezala funtzionatu " "ezkero portamoldea obetuko du." -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "mono irteerarako erabiliko den gailua" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." @@ -113,11 +113,11 @@ msgstr "" "Irakurri alsa dokumentazioa alsa gailuei buruzko informazio gehiago behar " "izan ezkero." -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "Estereo irteerak erabiltzen duen gailua" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." @@ -126,11 +126,11 @@ msgstr "" "Irakurri alsa dokumentazioa alsa gailuei buruzko informazio gehiago behar " "izan ezkero." -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "4 kanaletako irteerak erabiltzen duen gailua" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." @@ -139,11 +139,11 @@ msgstr "" "Irakurri alsa dokumentazioa alsa gailei buruzko informazio gehiago behar " "izan ezkero." -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "5.1 kanaletako irteerak erabiltzen duen gailua" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" @@ -153,7 +153,7 @@ msgstr "" "Irakurri alsa dokumentazioa alsa gailei buruzko informazio gehiago behar " "izan ezkero." -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" @@ -163,21 +163,21 @@ msgstr "" "hau kanpo ingurugiro dekodifikatzaileez erabil daiteke.\n" "Begiratu alsa dokumentazioa argibide gehiagorako." -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "snd_pcm_open()-ek huts egin du:%d:%s\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr ">>> Egiaztatu beste programa batek PCM darabilkien<<<\n" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "bozgorailu ordenamendua" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -236,79 +236,79 @@ msgstr "" "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." -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "audio_alsa_out : Onartutako moduak: " -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "8bit " -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "16bit " -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "24bit " -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "32bit " -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "mono " -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "estereo " -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "4-kanal " -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "(4-kanal ez dago gaiturik xine konfigruaketan)" -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "4.1-kanal " -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 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:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "5-kanal " -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "(5-kanal ez dago gaiturik xine konfigruaketan)" -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "5.1-kanal " -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 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:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "a/52 eta DTS pass-through\n" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 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" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "alsa nahasle gailua" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." @@ -316,7 +316,7 @@ msgstr "" "xinek alsa nahaslea erabiliko du bolumena aldatzeko.\n" "Begiratu alsa dokumentazioa alsa gailueri buruzko argibideentzat." -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" "xine audio irteera plugina alsa-konpilaturiko audio gailu/kontrolatzailea " diff --git a/po/fr.po b/po/fr.po index 46db2986c..3239c9078 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 0.9.13\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2002-06-07 15:08 +0200\n" "Last-Translator: Daniel Caujolle-Bert \n" "Language-Team: French \n" @@ -60,96 +60,96 @@ msgid "" "available: %s\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " "settings on the fly." msgstr "" -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " "will increase performance." msgstr "" -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "périphérique utilisé pour la sortie mono" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "périphérique utilisé pour la sortie stéréo" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "périphérique utilisé pour la sortie 4 canaux" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "périphérique utilisé pour la sortie 5.1 canaux" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, fuzzy, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "input_cda: open(%s) a échoué: %s.\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -181,89 +181,89 @@ msgid "" "formats you want to play to your sound card's digital output." msgstr "" -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "" -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "" -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "" -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 #, fuzzy msgid "4-channel " msgstr "canal" -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 #, fuzzy msgid "4.1-channel " msgstr "canal" -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 msgid "(4.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1551 +#: src/audio_out/audio_alsa_out.c:1546 #, fuzzy msgid "5-channel " msgstr "canal" -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 #, fuzzy msgid "5.1-channel " msgstr "canal" -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 msgid "(5.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 msgid "(a/52 and DTS pass-through not enabled in xine config)\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "périphérique du mixeur alsa" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" "plugin de sortie audio de xine utilisant les pilotes/périphériques alsa" diff --git a/po/it.po b/po/it.po index cb01b9abe..51dfcbb6f 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2006-06-18 23:05+0200\n" "Last-Translator: Diego 'Flameeyes' Pettenò \n" "Language-Team: Italian\n" @@ -67,11 +67,11 @@ msgstr "" "audio_alsa_out: configurazione errata per questo PCM: nessuna configurazione " "disponibile: %s\n" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "notifica modifiche al mixer hardware" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " @@ -81,16 +81,16 @@ msgstr "" "una notifica così che possa aggiornare la propria rappresentazione delle " "impostazioni del mixer al volo." -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "snd_lib_error_set_handler() non riuscita: %d" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "la scheda audio può usare mmap" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " @@ -101,11 +101,11 @@ msgstr "" "Si può provare ad abilitarlo e vedere se funziona, in qual caso migliorerà " "le prestazioni." -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "dispositivo usato per output mono" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." @@ -113,11 +113,11 @@ msgstr "" "xine utilizzerà questo dispositivo ALSA per riprodurre suono mono.\n" "Si veda la documentazione ALSA per informazioni sui dispositivi." -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "dispositivo usato per output stereo" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." @@ -125,11 +125,11 @@ msgstr "" "xine utilizzerà questo dispositivo ALSA per riprodurre suono stereo.\n" "Si veda la documentazione ALSA per informazioni sui dispositivi." -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "dispositivo usato per output a 4 canali" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." @@ -138,11 +138,11 @@ msgstr "" "canali (4.0.\n" "Si veda la documentazione ALSA per informazioni sui dispositivi." -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "dispositivo usato per output a canale 5.1" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" @@ -152,7 +152,7 @@ msgstr "" "canali più RFE (5.1).\n" "Si veda la documentazione ALSA per informazioni sui dispositivi." -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" @@ -163,21 +163,21 @@ msgstr "" "surround esterni.\n" "Si veda la documentazione ALSA per informazioni sui dispositivi." -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "snd_pcm_open() non riuscito:%d:%s\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr ">>>Controlla se un altro programma sta già usando PCM <<<\n" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "disposizione degli speaker" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -237,80 +237,80 @@ msgstr "" "scheda audio un decodificatore surround digitale capace di decodificare i " "formati che si vogliono riprodurre." -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "audio_alsa_out : i modi supportati sono " -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "8-bit " -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "16-bit " -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "24-bit" -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "32-bit" -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "mono " -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "stereo " -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "4-canali " -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "(4-canali non abilitato nella configurazione di xine) " -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "4.1-canali " -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 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:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "5-canali " -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "(5-canali non abilitati nella configurazione di xine) " -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "5.1-canali " -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 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:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "passaggio diretto a/52 e DTS\n" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 msgid "(a/52 and DTS pass-through not enabled in xine config)\n" msgstr "" "(passaggio diretto a/53 e DTS non abilitato nella configurazione di xine)\n" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "dispositivo mixer di alsa" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." @@ -319,7 +319,7 @@ msgstr "" "volume.\n" "Si veda la documentazione ALSA per informazioni sui dispositivi." -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" "plugin output audio di xine che usa i dispositivi/driver audio compiacenti " diff --git a/po/libxine1.pot b/po/libxine1.pot index b6299f96a..9a9aebafc 100644 --- a/po/libxine1.pot +++ b/po/libxine1.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,96 +62,96 @@ msgid "" "available: %s\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " "settings on the fly." msgstr "" -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " "will increase performance." msgstr "" -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -183,85 +183,85 @@ msgid "" "formats you want to play to your sound card's digital output." msgstr "" -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "" -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "" -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "" -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 msgid "(4.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 msgid "(5.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 msgid "(a/52 and DTS pass-through not enabled in xine config)\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" diff --git a/po/pl.po b/po/pl.po index f8e8d79bd..a098befaf 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pl_PL\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2003-05-24 12:36+0200\n" "Last-Translator: Bartłomiej Muryn <_4ever_@irc.pl>\n" "Language-Team: Polish \n" @@ -63,27 +63,27 @@ msgid "" "available: %s\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " "settings on the fly." msgstr "" -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " @@ -92,33 +92,33 @@ msgstr "" # src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728 # src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957 -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "urządzenie użyte w trybie mono" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" # src/audio_out/audio_alsa_out.c:191 src/audio_out/audio_alsa_out.c:920 -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "urządzenie użyte w trybie stereo" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" # src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927 -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "urządzenie użyte do wyjścia 4-kanałowego" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." @@ -126,39 +126,39 @@ msgstr "" # src/audio_out/audio_alsa_out.c:221 src/audio_out/audio_alsa_out.c:232 # src/audio_out/audio_alsa_out.c:941 src/audio_out/audio_alsa_out.c:948 -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "urządzenie użyte do wyjścia 5.1-kanałowego" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, fuzzy, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "osd: zawiodło iconv_open()\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -190,87 +190,87 @@ msgid "" "formats you want to play to your sound card's digital output." msgstr "" -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "" -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "" -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "" -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 msgid "(4.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 msgid "(5.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 msgid "(a/52 and DTS pass-through not enabled in xine config)\n" msgstr "" # src/audio_out/audio_alsa_out.c:862 src/audio_out/audio_alsa_out.c:1072 -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "urządzenie miksera alsa" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." msgstr "" # src/audio_out/audio_alsa_out.c:1105 -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" "wtyczka wyjścia dźwięku xine używająca sprzętu/sterowników kompatybilnych z " diff --git a/po/pt_BR.po b/po/pt_BR.po index f3c56d8ea..80507b0ed 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 0.9.13\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2002-01-22 18:31GMT-3\n" "Last-Translator: Marcelo Roberto Jimenez \n" "Language-Team: Portuguese (Brazilian) \n" @@ -61,96 +61,96 @@ msgid "" "available: %s\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " "settings on the fly." msgstr "" -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " "will increase performance." msgstr "" -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, fuzzy, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "input_cda: open(%s) failed: %s.\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -182,86 +182,86 @@ msgid "" "formats you want to play to your sound card's digital output." msgstr "" -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "" -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 msgid "16bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 msgid "24bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 msgid "32bit " msgstr "" -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 #, fuzzy msgid "mono " msgstr "metronom" -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "" -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 msgid "(4.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "" -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 msgid "(5.1-channel not enabled in xine config) " msgstr "" -#: src/audio_out/audio_alsa_out.c:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 msgid "(a/52 and DTS pass-through not enabled in xine config)\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" diff --git a/po/sk.po b/po/sk.po index 9cc9f3aec..9def62362 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.0\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-04-04 23:12+0200\n" +"POT-Creation-Date: 2007-04-06 15:39+0200\n" "PO-Revision-Date: 2004-09-15 13:53+0100\n" "Last-Translator: \n" "Language-Team: Slovak \n" @@ -68,96 +68,96 @@ msgstr "" "audio_alsa_out: poškodená konfigurácia pre toto PCM: konfigurácia " "nedostupná: %s\n" -#: src/audio_out/audio_alsa_out.c:1294 +#: src/audio_out/audio_alsa_out.c:1289 msgid "notify changes to the hardware mixer" msgstr "" -#: src/audio_out/audio_alsa_out.c:1295 +#: src/audio_out/audio_alsa_out.c:1290 msgid "" "When the hardware mixer changes, your application will receive a " "notification so that it can update its graphical representation of the mixer " "settings on the fly." msgstr "" -#: src/audio_out/audio_alsa_out.c:1360 +#: src/audio_out/audio_alsa_out.c:1355 #, c-format msgid "snd_lib_error_set_handler() failed: %d" msgstr "snd_lib_error_set_handler() zlyhal: %d" -#: src/audio_out/audio_alsa_out.c:1367 +#: src/audio_out/audio_alsa_out.c:1362 msgid "sound card can do mmap" msgstr "" -#: src/audio_out/audio_alsa_out.c:1368 +#: src/audio_out/audio_alsa_out.c:1363 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" "You can try enabling it and check, if everything works. If it does, this " "will increase performance." msgstr "" -#: src/audio_out/audio_alsa_out.c:1377 +#: src/audio_out/audio_alsa_out.c:1372 msgid "device used for mono output" msgstr "zariadenie pre mono výstup" -#: src/audio_out/audio_alsa_out.c:1378 +#: src/audio_out/audio_alsa_out.c:1373 msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1386 +#: src/audio_out/audio_alsa_out.c:1381 msgid "device used for stereo output" msgstr "zariadenie pre stereo výstup" -#: src/audio_out/audio_alsa_out.c:1387 +#: src/audio_out/audio_alsa_out.c:1382 msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1395 +#: src/audio_out/audio_alsa_out.c:1390 msgid "device used for 4-channel output" msgstr "zariadenie pre 4-kanálový výstup" -#: src/audio_out/audio_alsa_out.c:1396 +#: src/audio_out/audio_alsa_out.c:1391 msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1405 src/audio_out/audio_alsa_out.c:1415 +#: src/audio_out/audio_alsa_out.c:1400 src/audio_out/audio_alsa_out.c:1410 msgid "device used for 5.1-channel output" msgstr "zariadenie pre 5.1-kanálový výstup" -#: src/audio_out/audio_alsa_out.c:1406 +#: src/audio_out/audio_alsa_out.c:1401 msgid "" "xine will use this alsa device to output 5 channel plus LFE (5.1) surround " "sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1416 +#: src/audio_out/audio_alsa_out.c:1411 msgid "" "xine will use this alsa device to output undecoded digital surround sound. " "This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1436 +#: src/audio_out/audio_alsa_out.c:1431 #, c-format msgid "snd_pcm_open() failed:%d:%s\n" msgstr "snd_pcm_open() zlyhal:%d:%s\n" -#: src/audio_out/audio_alsa_out.c:1438 +#: src/audio_out/audio_alsa_out.c:1433 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" msgstr ">>> Skontrolujte či už iný program používa PCM <<<\n" -#: src/audio_out/audio_alsa_out.c:1469 src/audio_out/audio_oss_out.c:929 +#: src/audio_out/audio_alsa_out.c:1464 src/audio_out/audio_oss_out.c:929 msgid "speaker arrangement" msgstr "" -#: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:930 +#: src/audio_out/audio_alsa_out.c:1465 src/audio_out/audio_oss_out.c:930 msgid "" "Select how your speakers are arranged, this determines which speakers xine " "uses for sound output. The individual values are:\n" @@ -189,88 +189,88 @@ msgid "" "formats you want to play to your sound card's digital output." msgstr "" -#: src/audio_out/audio_alsa_out.c:1499 +#: src/audio_out/audio_alsa_out.c:1494 msgid "audio_alsa_out : supported modes are " msgstr "audio_alsa_out : podporované módy sú " -#: src/audio_out/audio_alsa_out.c:1502 +#: src/audio_out/audio_alsa_out.c:1497 msgid "8bit " msgstr "8bit " -#: src/audio_out/audio_alsa_out.c:1507 +#: src/audio_out/audio_alsa_out.c:1502 #, fuzzy msgid "16bit " msgstr "8bit " -#: src/audio_out/audio_alsa_out.c:1511 +#: src/audio_out/audio_alsa_out.c:1506 #, fuzzy msgid "24bit " msgstr "8bit " -#: src/audio_out/audio_alsa_out.c:1515 +#: src/audio_out/audio_alsa_out.c:1510 #, fuzzy msgid "32bit " msgstr "8bit " -#: src/audio_out/audio_alsa_out.c:1526 +#: src/audio_out/audio_alsa_out.c:1521 msgid "mono " msgstr "mono " -#: src/audio_out/audio_alsa_out.c:1530 +#: src/audio_out/audio_alsa_out.c:1525 msgid "stereo " msgstr "stereo " -#: src/audio_out/audio_alsa_out.c:1535 +#: src/audio_out/audio_alsa_out.c:1530 msgid "4-channel " msgstr "4-kanály " -#: src/audio_out/audio_alsa_out.c:1538 +#: src/audio_out/audio_alsa_out.c:1533 msgid "(4-channel not enabled in xine config) " msgstr "(4-kanály nepovolené v xine konfigu) " -#: src/audio_out/audio_alsa_out.c:1543 +#: src/audio_out/audio_alsa_out.c:1538 msgid "4.1-channel " msgstr "4.1-kanálov " -#: src/audio_out/audio_alsa_out.c:1546 +#: src/audio_out/audio_alsa_out.c:1541 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:1551 +#: src/audio_out/audio_alsa_out.c:1546 msgid "5-channel " msgstr "5-kanálov " -#: src/audio_out/audio_alsa_out.c:1554 +#: src/audio_out/audio_alsa_out.c:1549 msgid "(5-channel not enabled in xine config) " msgstr "(5-kanálov nepovolené v xine konfigu) " -#: src/audio_out/audio_alsa_out.c:1559 +#: src/audio_out/audio_alsa_out.c:1554 msgid "5.1-channel " msgstr "5.1-kanálov " -#: src/audio_out/audio_alsa_out.c:1562 +#: src/audio_out/audio_alsa_out.c:1557 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:1585 +#: src/audio_out/audio_alsa_out.c:1580 msgid "a/52 and DTS pass-through\n" msgstr "a/52 a DTS pass-through\n" -#: src/audio_out/audio_alsa_out.c:1588 +#: src/audio_out/audio_alsa_out.c:1583 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" -#: src/audio_out/audio_alsa_out.c:1595 +#: src/audio_out/audio_alsa_out.c:1590 msgid "alsa mixer device" msgstr "alsa mixovacie zaridenie" -#: src/audio_out/audio_alsa_out.c:1596 +#: src/audio_out/audio_alsa_out.c:1591 msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1670 +#: src/audio_out/audio_alsa_out.c:1665 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" "výstupný xine audio plugin používa alsa-compliant audio zariadenia/ovládače" -- cgit v1.2.3 From e7b343f647fa5c44551946b39afdeebe0812c8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 16:17:04 +0200 Subject: Define a xinepostdir directory to point to the post-plugins path. Together with this, define a xinepost_LTLIBRARIES class that is used to install the post-plugins in the correct directory. Also add the rule to remove them. --- misc/Makefile.common | 7 +++++++ src/post/audio/Makefile.am | 4 +--- src/post/deinterlace/Makefile.am | 4 +--- src/post/deinterlace/plugins/Makefile.am | 2 -- src/post/goom/Makefile.am | 4 +--- src/post/mosaico/Makefile.am | 4 +--- src/post/planar/Makefile.am | 4 +--- src/post/visualizations/Makefile.am | 4 +--- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/misc/Makefile.common b/misc/Makefile.common index aa5ec1013..739ebb54e 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -5,6 +5,8 @@ xineincludedir = $(includedir)/xine xineplugdir = $(XINE_PLUGINDIR) xineplug_ldflags = $(NOUNDEF) -avoid-version -module +xinepostdir = $(XINE_PLUGINDIR)/post + $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) @@ -54,6 +56,11 @@ uninstall-hook: echo " rm -f $(DESTDIR)$(xineplugdir)/$$p"; \ rm -f $(DESTDIR)$(xineplugdir)/$$p; \ done; + @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(xinepostdir)/$$p"; \ + rm -f $(DESTDIR)$(xinepostdir)/$$p; \ + done; mostlyclean-generic: -rm -f *~ \#* .*~ .\#* diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am index 9cb93dd5a..f4018a780 100644 --- a/src/post/audio/Makefile.am +++ b/src/post/audio/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/misc/Makefile.common noinst_HEADERS = dsp.h filter.h window.h audio_filters.h -libdir = $(XINE_PLUGINDIR)/post - -lib_LTLIBRARIES = xineplug_post_audio_filters.la +xinepost_LTLIBRARIES = xineplug_post_audio_filters.la xineplug_post_audio_filters_la_SOURCES = \ upmix.c upmix_mono.c filter.c window.c stretch.c volnorm.c audio_filters.c diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am index 0914e114a..d2d1d5c10 100644 --- a/src/post/deinterlace/Makefile.am +++ b/src/post/deinterlace/Makefile.am @@ -4,9 +4,7 @@ SUBDIRS = plugins EXTRA_DIST = -libdir = $(XINE_PLUGINDIR)/post - -lib_LTLIBRARIES = xineplug_post_tvtime.la +xinepost_LTLIBRARIES = xineplug_post_tvtime.la xineplug_post_tvtime_la_SOURCES = xine_plugin.c \ deinterlace.c pulldown.c speedy.c tvtime.c diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am index e6e785211..17d170127 100644 --- a/src/post/deinterlace/plugins/Makefile.am +++ b/src/post/deinterlace/plugins/Makefile.am @@ -32,8 +32,6 @@ EXTRA_DIST = greedy2frame_template.c greedyh.asm \ AM_CFLAGS = -I$(top_srcdir)/src/post/deinterlace \ -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc -libdir = $(XINE_PLUGINDIR)/post - noinst_LTLIBRARIES = libdeinterlaceplugins.la libdeinterlaceplugins_la_SOURCES = \ diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index 4aeda8f04..e6bae3374 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/misc/Makefile.common -libdir = $(XINE_PLUGINDIR)/post - EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch \ gfontrle.c mathtools.c @@ -10,7 +8,7 @@ EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_releas #CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os/-O2/g'` CFLAGS = `echo @CFLAGS@ | sed -e 's/-Os/-O2/g'` -lib_LTLIBRARIES = xineplug_post_goom.la +xinepost_LTLIBRARIES = xineplug_post_goom.la ## doesn't work #if PPC_ARCH diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am index f5497b1af..c18b4e19c 100644 --- a/src/post/mosaico/Makefile.am +++ b/src/post/mosaico/Makefile.am @@ -1,8 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -libdir = $(XINE_PLUGINDIR)/post - -lib_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la +xinepost_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la xineplug_post_mosaico_la_SOURCES = mosaico.c xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 2e60671b5..5fc425cdf 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -15,9 +15,7 @@ endif # work, but at least it compiles. AM_CFLAGS = $(ff_cflags) -fomit-frame-pointer -libdir = $(XINE_PLUGINDIR)/post - -lib_LTLIBRARIES = xineplug_post_planar.la +xinepost_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ denoise3d.c eq.c eq2.c unsharp.c pp.c noise.c diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am index dc7679103..f42598d9c 100644 --- a/src/post/visualizations/Makefile.am +++ b/src/post/visualizations/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooviz.c -libdir = $(XINE_PLUGINDIR)/post - -lib_LTLIBRARIES = xineplug_post_visualizations.la +xinepost_LTLIBRARIES = xineplug_post_visualizations.la xineplug_post_visualizations_la_SOURCES = \ visualizations.c fft.c fftscope.c oscope.c fftgraph.c -- cgit v1.2.3 From 8d13033d6c84109fff3d2788d9bb844462ad6b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 16:18:25 +0200 Subject: Similarly, add a vidix_LTLIBRARIES class to install the vidix drivers in the correct location. --- misc/Makefile.common | 6 ++++++ src/video_out/vidix/drivers/Makefile.am | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/misc/Makefile.common b/misc/Makefile.common index 739ebb54e..357c19666 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -6,6 +6,7 @@ xineplugdir = $(XINE_PLUGINDIR) xineplug_ldflags = $(NOUNDEF) -avoid-version -module xinepostdir = $(XINE_PLUGINDIR)/post +vidixdir = $(XINE_PLUGINDIR)/vidix $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) @@ -61,6 +62,11 @@ uninstall-hook: echo " rm -f $(DESTDIR)$(xinepostdir)/$$p"; \ rm -f $(DESTDIR)$(xinepostdir)/$$p; \ done; + @list='$(vidix_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(vidixdir)/$$p"; \ + rm -f $(DESTDIR)$(vidixdir)/$$p; \ + done; mostlyclean-generic: -rm -f *~ \#* .*~ .\#* diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 3c0369af7..f438dde36 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = genfb_vid.c -libdir = $(XINE_PLUGINDIR)/vidix - if HAVE_VIDIX vidix_drivers = \ mach64_vid.la \ @@ -20,7 +18,7 @@ vidix_drivers = \ savage_vid.la endif -lib_LTLIBRARIES = $(vidix_drivers) +vidix_LTLIBRARIES = $(vidix_drivers) radeon_vid_la_SOURCES = radeon_vid.c radeon_vid_la_LDFLAGS = -avoid-version -module -lm -- cgit v1.2.3 From 8a843e03d0cbdf532f9820e475cff1238b114bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 16:24:09 +0200 Subject: Properly use chcon over only xineplug and xinepost libraries. This reduces the number of objects that are allowed to contain TEXT section relocations (skipping for instance libxine and the vidix drivers). This is still suboptimal because only those plugins that actually contains text relocation should be allowed to contain them (that is what is done with IMPURE_TEXT_LDFLAGS for Solaris and Darwin). --- misc/Makefile.common | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/misc/Makefile.common b/misc/Makefile.common index 357c19666..3bae6f001 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -18,14 +18,18 @@ install-data-hook: fi; \ fi; \ if test -x /usr/bin/chcon -a "`id -u`" -eq 0; then \ - list='$(lib_LTLIBRARIES)'; \ - if test -n "$$list" ; then \ + list='$(xineplug_LTLIBRARIES)'; \ for p in $$list; do \ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ - echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(libdir)/$$p"; \ - chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(libdir)/$$p || :; \ + echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xineplugdir)/$$p"; \ + chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xineplugdir)/$$p || :; \ + done; \ + list='$(xinepost_LTLIBRARIES)'; \ + for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xinepostdir)/$$p"; \ + chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xinepostdir)/$$p || :; \ done; \ - fi; \ fi pass1: -- cgit v1.2.3 From 0a725e9e1bceb83c24c0e2455d640fd616be74a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 16:28:15 +0200 Subject: Remove a redundant comment. --- src/audio_out/Makefile.am | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index 1329b0f62..20a4e708b 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -68,14 +68,6 @@ xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplug_ao_out_file.la \ $(fusionsound_module) \ $(jack_module) -#lib_LTLIBRARIES = \ -# $(alsa_module) \ -# $(arts_module) \ -# $(esd_module) \ -# $(irixal_module) \ -# $(oss_module) \ -# $(sun_module) - xineplug_ao_out_none_la_SOURCES = audio_none_out.c xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) xineplug_ao_out_none_la_CFLAGS = $(VISIBILITY_FLAG) -- cgit v1.2.3 From 3445cc5bf8d58dc0fa34eb0e5d12b83617670fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 17:07:37 +0200 Subject: Now that all plugins install using xineplug_LTLIBRARIES, avoid grepping libdir for plugins installation. With this change, it avoids running an egrep command for every directory at uninstall time; the for has way less impact as the list can just be empty. --- misc/Makefile.common | 7 ------- 1 file changed, 7 deletions(-) diff --git a/misc/Makefile.common b/misc/Makefile.common index 3bae6f001..d23ea5b5e 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -49,13 +49,6 @@ install-debug: debug $(MAKE) $(AM_MAKEFLAGS) install-data-hook uninstall-hook: - @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \ - list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ - rm -f $(DESTDIR)$(libdir)/$$p; \ - done; \ - fi @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ echo " rm -f $(DESTDIR)$(xineplugdir)/$$p"; \ -- cgit v1.2.3 From 6ca146bc0ffc2825402a8fb39b156394a614c1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 6 Apr 2007 17:10:58 +0200 Subject: Remove executable bit from dsp files. --- win32/xineplug_dmx_audio.dsp | 0 win32/xineplug_dmx_lpcm.dsp | 0 win32/xineplug_dmx_nsv.dsp | 0 win32/xineplug_dmx_pva.dsp | 0 win32/xineplug_dmx_real.dsp | 0 win32/xineplug_dmx_slave.dsp | 0 win32/xineplug_dmx_yuv4mpeg2.dsp | 0 win32/xineplug_dmx_yuv_frames.dsp | 0 win32/xineplug_inp_cdda.dsp | 0 win32/xineplug_inp_http.dsp | 0 win32/xineplug_inp_net.dsp | 0 win32/xineplug_vo_out_sdl.dsp | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 win32/xineplug_dmx_audio.dsp mode change 100755 => 100644 win32/xineplug_dmx_lpcm.dsp mode change 100755 => 100644 win32/xineplug_dmx_nsv.dsp mode change 100755 => 100644 win32/xineplug_dmx_pva.dsp mode change 100755 => 100644 win32/xineplug_dmx_real.dsp mode change 100755 => 100644 win32/xineplug_dmx_slave.dsp mode change 100755 => 100644 win32/xineplug_dmx_yuv4mpeg2.dsp mode change 100755 => 100644 win32/xineplug_dmx_yuv_frames.dsp mode change 100755 => 100644 win32/xineplug_inp_cdda.dsp mode change 100755 => 100644 win32/xineplug_inp_http.dsp mode change 100755 => 100644 win32/xineplug_inp_net.dsp mode change 100755 => 100644 win32/xineplug_vo_out_sdl.dsp diff --git a/win32/xineplug_dmx_audio.dsp b/win32/xineplug_dmx_audio.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_lpcm.dsp b/win32/xineplug_dmx_lpcm.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_nsv.dsp b/win32/xineplug_dmx_nsv.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_pva.dsp b/win32/xineplug_dmx_pva.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_real.dsp b/win32/xineplug_dmx_real.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_slave.dsp b/win32/xineplug_dmx_slave.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_yuv4mpeg2.dsp b/win32/xineplug_dmx_yuv4mpeg2.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_dmx_yuv_frames.dsp b/win32/xineplug_dmx_yuv_frames.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_inp_cdda.dsp b/win32/xineplug_inp_cdda.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_inp_http.dsp b/win32/xineplug_inp_http.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_inp_net.dsp b/win32/xineplug_inp_net.dsp old mode 100755 new mode 100644 diff --git a/win32/xineplug_vo_out_sdl.dsp b/win32/xineplug_vo_out_sdl.dsp old mode 100755 new mode 100644 -- cgit v1.2.3 From 433a362b6dcff0d02f8181bf75fbeedff09b775f Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 6 Apr 2007 16:28:01 +0100 Subject: Remove executable status from all files which shouldn't have it. --- misc/relchk.sh.in | 0 src/audio_out/audio_directx_out.c | 0 src/libffmpeg/libavcodec/bitstream.c | 0 src/libffmpeg/libavcodec/h261data.h | 0 src/libffmpeg/libavcodec/h264idct.c | 0 src/libffmpeg/libavcodec/ppc/dsputil_h264_altivec.c | 0 src/libffmpeg/libavcodec/ppc/dsputil_h264_template_altivec.c | 0 src/libffmpeg/libavcodec/ulti.c | 0 src/libffmpeg/libavcodec/ulti_cb.h | 0 src/libmad/bit.c | 0 src/libmad/fixed.h | 0 src/libmad/frame.c | 0 src/libmad/frame.h | 0 src/libmad/layer12.c | 0 src/libmad/layer3.c | 0 src/libmad/synth.c | 0 src/libmad/timer.c | 0 src/libmad/timer.h | 0 src/post/goom/gfontlib.c | 0 src/post/goom/gfontlib.h | 0 src/post/goom/gfontrle.c | 0 src/post/goom/mathtools.h | 0 src/post/goom/mmx.h | 0 src/post/goom/surf3d.c | 0 src/post/goom/surf3d.h | 0 src/post/goom/tentacle3d.c | 0 src/post/goom/tentacle3d.h | 0 src/post/goom/v3d.h | 0 src/post/planar/pp.c | 0 src/video_out/video_out_directx.c | 0 win32/README | 0 win32/config.h | 0 win32/include/sys/socket.h | 0 33 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 misc/relchk.sh.in mode change 100755 => 100644 src/audio_out/audio_directx_out.c mode change 100755 => 100644 src/libffmpeg/libavcodec/bitstream.c mode change 100755 => 100644 src/libffmpeg/libavcodec/h261data.h mode change 100755 => 100644 src/libffmpeg/libavcodec/h264idct.c mode change 100755 => 100644 src/libffmpeg/libavcodec/ppc/dsputil_h264_altivec.c mode change 100755 => 100644 src/libffmpeg/libavcodec/ppc/dsputil_h264_template_altivec.c mode change 100755 => 100644 src/libffmpeg/libavcodec/ulti.c mode change 100755 => 100644 src/libffmpeg/libavcodec/ulti_cb.h mode change 100755 => 100644 src/libmad/bit.c mode change 100755 => 100644 src/libmad/fixed.h mode change 100755 => 100644 src/libmad/frame.c mode change 100755 => 100644 src/libmad/frame.h mode change 100755 => 100644 src/libmad/layer12.c mode change 100755 => 100644 src/libmad/layer3.c mode change 100755 => 100644 src/libmad/synth.c mode change 100755 => 100644 src/libmad/timer.c mode change 100755 => 100644 src/libmad/timer.h mode change 100755 => 100644 src/post/goom/gfontlib.c mode change 100755 => 100644 src/post/goom/gfontlib.h mode change 100755 => 100644 src/post/goom/gfontrle.c mode change 100755 => 100644 src/post/goom/mathtools.h mode change 100755 => 100644 src/post/goom/mmx.h mode change 100755 => 100644 src/post/goom/surf3d.c mode change 100755 => 100644 src/post/goom/surf3d.h mode change 100755 => 100644 src/post/goom/tentacle3d.c mode change 100755 => 100644 src/post/goom/tentacle3d.h mode change 100755 => 100644 src/post/goom/v3d.h mode change 100755 => 100644 src/post/planar/pp.c mode change 100755 => 100644 src/video_out/video_out_directx.c mode change 100755 => 100644 win32/README mode change 100755 => 100644 win32/config.h mode change 100755 => 100644 win32/include/sys/socket.h diff --git a/misc/relchk.sh.in b/misc/relchk.sh.in old mode 100755 new mode 100644 diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/bitstream.c b/src/libffmpeg/libavcodec/bitstream.c old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/h261data.h b/src/libffmpeg/libavcodec/h261data.h old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/h264idct.c b/src/libffmpeg/libavcodec/h264idct.c old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/ppc/dsputil_h264_altivec.c b/src/libffmpeg/libavcodec/ppc/dsputil_h264_altivec.c old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/ppc/dsputil_h264_template_altivec.c b/src/libffmpeg/libavcodec/ppc/dsputil_h264_template_altivec.c old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/ulti.c b/src/libffmpeg/libavcodec/ulti.c old mode 100755 new mode 100644 diff --git a/src/libffmpeg/libavcodec/ulti_cb.h b/src/libffmpeg/libavcodec/ulti_cb.h old mode 100755 new mode 100644 diff --git a/src/libmad/bit.c b/src/libmad/bit.c old mode 100755 new mode 100644 diff --git a/src/libmad/fixed.h b/src/libmad/fixed.h old mode 100755 new mode 100644 diff --git a/src/libmad/frame.c b/src/libmad/frame.c old mode 100755 new mode 100644 diff --git a/src/libmad/frame.h b/src/libmad/frame.h old mode 100755 new mode 100644 diff --git a/src/libmad/layer12.c b/src/libmad/layer12.c old mode 100755 new mode 100644 diff --git a/src/libmad/layer3.c b/src/libmad/layer3.c old mode 100755 new mode 100644 diff --git a/src/libmad/synth.c b/src/libmad/synth.c old mode 100755 new mode 100644 diff --git a/src/libmad/timer.c b/src/libmad/timer.c old mode 100755 new mode 100644 diff --git a/src/libmad/timer.h b/src/libmad/timer.h old mode 100755 new mode 100644 diff --git a/src/post/goom/gfontlib.c b/src/post/goom/gfontlib.c old mode 100755 new mode 100644 diff --git a/src/post/goom/gfontlib.h b/src/post/goom/gfontlib.h old mode 100755 new mode 100644 diff --git a/src/post/goom/gfontrle.c b/src/post/goom/gfontrle.c old mode 100755 new mode 100644 diff --git a/src/post/goom/mathtools.h b/src/post/goom/mathtools.h old mode 100755 new mode 100644 diff --git a/src/post/goom/mmx.h b/src/post/goom/mmx.h old mode 100755 new mode 100644 diff --git a/src/post/goom/surf3d.c b/src/post/goom/surf3d.c old mode 100755 new mode 100644 diff --git a/src/post/goom/surf3d.h b/src/post/goom/surf3d.h old mode 100755 new mode 100644 diff --git a/src/post/goom/tentacle3d.c b/src/post/goom/tentacle3d.c old mode 100755 new mode 100644 diff --git a/src/post/goom/tentacle3d.h b/src/post/goom/tentacle3d.h old mode 100755 new mode 100644 diff --git a/src/post/goom/v3d.h b/src/post/goom/v3d.h old mode 100755 new mode 100644 diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c old mode 100755 new mode 100644 diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c old mode 100755 new mode 100644 diff --git a/win32/README b/win32/README old mode 100755 new mode 100644 diff --git a/win32/config.h b/win32/config.h old mode 100755 new mode 100644 diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h old mode 100755 new mode 100644 -- cgit v1.2.3 From 8916b3166c347827c1de8af37c42be52107d2a4c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 7 Apr 2007 16:46:56 +0100 Subject: Ignore *.orig files (generated by hg revert). --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index 37c433c51..dee65bc77 100644 --- a/.hgignore +++ b/.hgignore @@ -1,5 +1,6 @@ syntax: glob *~ +*.orig *.lo *.la -- cgit v1.2.3 From 162053c1e9e40f223e498dd0630487db86f68543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 7 Apr 2007 19:13:16 +0200 Subject: Revert changeset 8383: variable-sized structures and arrays don't seem to get along that well. --- src/xine-engine/buffer_types.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 4a71a99c2..2d455b67c 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -49,13 +49,13 @@ typedef struct video_db_s { uint32_t fourcc[20]; uint32_t buf_type; - const char name[]; + const char *name; } video_db_t; typedef struct audio_db_s { uint32_t formattag[10]; uint32_t buf_type; - const char name[]; + const char *name; } audio_db_t; -- cgit v1.2.3 From 13ef1266e96335725e4b00cbe84753cfb1d9c52c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 7 Apr 2007 18:34:07 +0100 Subject: Use CC_ATTRIBUTE_FORMAT; replace __attribute((format(printf, ...))) accordingly. --- configure.ac | 2 ++ include/xine.h.in | 11 ++--------- lib/os_internal.h | 4 ++-- src/audio_out/audio_alsa_out.c | 5 +---- src/audio_out/audio_directx2_out.c | 5 +---- src/demuxers/demux_qt.c | 10 +++++----- src/input/input_cdda.c | 5 +---- src/input/vcd/xine-extra.h | 12 ++---------- src/libw32dll/wine/debugtools.h | 6 +----- src/libw32dll/wine/ext.h | 3 ++- src/libw32dll/wine/win32.c | 13 +++++++------ src/libxineadec/nosefart/log.h | 7 ++----- src/xine-engine/broadcaster.c | 10 ++-------- src/xine-utils/attributes.h | 12 ++++++++++++ src/xine-utils/xine_check.c | 5 +---- 15 files changed, 43 insertions(+), 67 deletions(-) diff --git a/configure.ac b/configure.ac index 1b00ed203..7243b3c34 100644 --- a/configure.ac +++ b/configure.ac @@ -2170,6 +2170,8 @@ fi AC_SUBST([VISIBILITY_FLAG]) CC_ATTRIBUTE_SENTINEL +CC_ATTRIBUTE_FORMAT +CC_ATTRIBUTE_FORMAT_ARG AC_OPTIMIZATIONS diff --git a/include/xine.h.in b/include/xine.h.in index e4210d314..f25038796 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -792,17 +792,10 @@ int xine_get_log_section_count(xine_t *self) XINE_PROTECTED; const char *const *xine_get_log_names(xine_t *self) XINE_PROTECTED; /* print some log information to section */ -#ifndef __GNUC__ void xine_log (xine_t *self, int buf, - const char *format, ...) XINE_PROTECTED; + const char *format, ...) XINE_FORMAT_PRINTF(3, 4) XINE_PROTECTED; void xine_vlog(xine_t *self, int buf, - const char *format, va_list args) XINE_PROTECTED; -#else -void xine_log (xine_t *self, int buf, - const char *format, ...) __attribute__ ((__format__(printf, 3, 4))) XINE_PROTECTED; -void xine_vlog(xine_t *self, int buf, - const char *format, va_list args) __attribute__ ((__format__(printf, 3, 0))) XINE_PROTECTED; -#endif + const char *format, va_list args) XINE_FORMAT_PRINTF(3, 0) XINE_PROTECTED; /* get log messages of specified section */ char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED; diff --git a/lib/os_internal.h b/lib/os_internal.h index 8ecfbaeab..dd48e04f7 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -120,8 +120,8 @@ void xine_private_unsetenv(const char *name); #define asprintf(STRINGPP, FORMAT, ...) xine_private_asprintf((STRINGPP), FORMAT, __VA_ARGS__) #endif #define vasprintf(STRINGPP, FORMAT, VA_ARG) xine_private_vasprintf((STRINGPP), (FORMAT), (VA_ARG)) -int xine_private_asprintf(char **string, const char *format, ...) __attribute__ ((format (printf, 2, 3))); -int xine_private_vasprintf(char **string, const char *format, va_list ap) __attribute__ ((format (printf, 2, 0))); +int xine_private_asprintf(char **string, const char *format, ...) XINE_FORMAT_PRINTF(2, 3); +int xine_private_vasprintf(char **string, const char *format, va_list ap) XINE_FORMAT_PRINTF(2, 0); #endif /* replacement of strndup */ diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index f176b7594..6ad78da2a 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -265,10 +265,7 @@ static long ao_alsa_get_volume_from_percent(int val, long min, long max) { * Error callback, we need to control this, * error message should be printed only in DEBUG mode. */ -static void -#ifdef __GNUC__ - __attribute__((format (printf, 5, 6))) -#endif +static void XINE_FORMAT_PRINTF(5, 6) error_callback(const char *file, int line, const char *function, int err, const char *fmt, ...) { #ifdef DEBUG diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index aff4412ec..7161f192d 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -151,10 +151,7 @@ static int buffer_ready(dx2_driver_t *this); /* popup a dialog with error */ -static void -#ifdef __GNUC__ - __attribute__((format (printf, 1, 2))) -#endif +static void XINE_FORMAT_PRINTF(1, 2) error_message(const char *fmt, ...) { char message[256]; va_list ap; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 4144f3049..6693637c7 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -417,31 +417,31 @@ typedef struct { #if DEBUG_ATOM_LOAD #define debug_atom_load printf #else -static inline void __attribute__((format (printf, 1, 2))) debug_atom_load(const char *format, ...) {} +static inline void XINE_FORMAT_PRINTF(1, 2) debug_atom_load(const char *format, ...) {} #endif #if DEBUG_EDIT_LIST #define debug_edit_list printf #else -static inline void __attribute__((format (printf, 1, 2))) debug_edit_list(const char *format, ...) {} +static inline void XINE_FORMAT_PRINTF(1, 2) debug_edit_list(const char *format, ...) {} #endif #if DEBUG_FRAME_TABLE #define debug_frame_table printf #else -static inline void __attribute__((format (printf, 1, 2))) debug_frame_table(const char *format, ...) {} +static inline void XINE_FORMAT_PRINTF(1, 2) debug_frame_table(const char *format, ...) {} #endif #if DEBUG_VIDEO_DEMUX #define debug_video_demux printf #else -static inline void __attribute__((format (printf, 1, 2))) debug_video_demux(const char *format, ...) {} +static inline void XINE_FORMAT_PRINTF(1, 2) debug_video_demux(const char *format, ...) {} #endif #if DEBUG_AUDIO_DEMUX #define debug_audio_demux printf #else -static inline void __attribute__((format (printf, 1, 2))) debug_audio_demux(const char *format, ...) {} +static inline void XINE_FORMAT_PRINTF(1, 2) debug_audio_demux(const char *format, ...) {} #endif static inline void dump_moov_atom(unsigned char *moov_atom, int moov_atom_size) { diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index d21c8e4db..7dd9ae21a 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -988,10 +988,7 @@ static int parse_url (char *urlbuf, char** host, int *port) { } #endif -static int -#ifdef __GNUC__ -__attribute__((format (printf, 4, 5))) -#endif +static int XINE_FORMAT_PRINTF(4, 5) network_command( xine_stream_t *stream, int socket, char *data_buf, char *msg, ...) { char buf[_BUFSIZ]; diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h index d0b2a0bb5..cde9a26f6 100644 --- a/src/input/vcd/xine-extra.h +++ b/src/input/vcd/xine-extra.h @@ -80,11 +80,7 @@ bool xine_log_init(xine_t *this); an error, such as logging wasn't initialized. On error, nothing is logged. */ -bool xine_log_msg(const char *format, ...) -#ifdef __GNUC__ -__attribute__((format (printf, 1, 2))) -#endif -; +bool xine_log_msg(const char *format, ...) XINE_FORMAT_PRINTF(1, 2); /*! This routine is like xine_log without any xine-specific paramenters. Before calling this routine you should have set up a xine log buffer via @@ -96,11 +92,7 @@ __attribute__((format (printf, 1, 2))) an error, such as logging wasn't initialized. On error, nothing is logged. */ -bool xine_log_err(const char *format, ...) -#ifdef __GNUC__ -__attribute__((format (printf, 1, 2))) -#endif -; +bool xine_log_err(const char *format, ...) XINE_FORMAT_PRINTF(1, 2); /* Free all (num_mrls) MRLS. */ void xine_free_mrls(int *num_mrls, xine_mrl_t **mrls); diff --git a/src/libw32dll/wine/debugtools.h b/src/libw32dll/wine/debugtools.h index 038c05309..3b342e10c 100644 --- a/src/libw32dll/wine/debugtools.h +++ b/src/libw32dll/wine/debugtools.h @@ -80,11 +80,7 @@ static inline LPCSTR debugstr_w( LPCWSTR s ) { return debugstr_wn( s, 80 ); } #endif #if 0 /* dbg_printf already defined as a macro */ -#ifdef __GNUC__ -extern int dbg_printf(const char *format, ...) __attribute__((format (printf,1,2))); -#else -extern int dbg_printf(const char *format, ...); -#endif +extern int dbg_printf(const char *format, ...) XINE_FORMAT_PRINTF(1,2); #endif #define TRACE_(X) TRACE diff --git a/src/libw32dll/wine/ext.h b/src/libw32dll/wine/ext.h index 7b284ca79..f0f505c4d 100644 --- a/src/libw32dll/wine/ext.h +++ b/src/libw32dll/wine/ext.h @@ -2,6 +2,7 @@ #define loader_ext_h #include "windef.h" +#include "attributes.h" extern LPVOID FILE_dommap( int unix_handle, LPVOID start, DWORD size_high, DWORD size_low, @@ -9,6 +10,6 @@ extern LPVOID FILE_dommap( int unix_handle, LPVOID start, int prot, int flags ); extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low ); extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n); -extern int __attribute__ ((format (printf, 1, 2))) __vprintf( const char *format, ... ); +extern int XINE_FORMAT_PRINTF(1, 2) __vprintf( const char *format, ... ); #endif diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c index 4fe1956b7..397779f72 100644 --- a/src/libw32dll/wine/win32.c +++ b/src/libw32dll/wine/win32.c @@ -12,6 +12,7 @@ for DLL to know too much about its environment. ************************************************************/ #include "config.h" +#include "attributes.h" #define QTX @@ -183,7 +184,7 @@ static void longcount_stub(long long* z) int LOADER_DEBUG=1; // active only if compiled with -DDETAILED_OUT //#define DETAILED_OUT -static inline void __attribute__((__format__(__printf__, 1, 2))) dbgprintf(char* fmt, ...) +static inline void XINE_FORMAT_PRINTF(1, 2) dbgprintf(char* fmt, ...) { #ifdef DETAILED_OUT if(LOADER_DEBUG) @@ -3976,7 +3977,7 @@ static void* exp__dllonexit() return NULL; } -static int __attribute__((__format__(__printf__, 2, 3))) expwsprintfA(char* string, char* format, ...) +static int XINE_FORMAT_PRINTF(2, 3) expwsprintfA(char* string, char* format, ...) { va_list va; int result; @@ -3987,7 +3988,7 @@ static int __attribute__((__format__(__printf__, 2, 3))) expwsprintfA(char* stri return result; } -static int __attribute__((__format__(__printf__, 2, 3))) expsprintf(char* str, const char* format, ...) +static int XINE_FORMAT_PRINTF(2, 3) expsprintf(char* str, const char* format, ...) { va_list args; int r; @@ -3997,7 +3998,7 @@ static int __attribute__((__format__(__printf__, 2, 3))) expsprintf(char* str, c va_end(args); return r; } -static int __attribute__((__format__(__printf__, 2, 3))) expsscanf(const char* str, const char* format, ...) +static int XINE_FORMAT_PRINTF(2, 3) expsscanf(const char* str, const char* format, ...) { va_list args; int r; @@ -4013,7 +4014,7 @@ static void* expfopen(const char* path, const char* mode) //return fopen(path, mode); return fdopen(0, mode); // everything on screen } -static int __attribute__((__format__(__printf__, 2, 3)))expfprintf(void* stream, const char* format, ...) +static int XINE_FORMAT_PRINTF(2, 3)expfprintf(void* stream, const char* format, ...) { va_list args; int r = 0; @@ -4026,7 +4027,7 @@ static int __attribute__((__format__(__printf__, 2, 3)))expfprintf(void* stream, return r; } -static int __attribute__((__format__(__printf__, 1, 2))) expprintf(const char* format, ...) +static int XINE_FORMAT_PRINTF(1, 2) expprintf(const char* format, ...) { va_list args; int r; diff --git a/src/libxineadec/nosefart/log.h b/src/libxineadec/nosefart/log.h index c3494a6c7..a12deff0a 100644 --- a/src/libxineadec/nosefart/log.h +++ b/src/libxineadec/nosefart/log.h @@ -27,15 +27,12 @@ #define _LOG_H_ #include +#include "attributes.h" extern int log_init(void); extern void log_shutdown(void); extern void log_print(const char *string); -extern void log_printf(const char *format, ...) -#ifdef __GNUC__ -__attribute__ ((format (printf, 1, 2))) -#endif -; +extern void log_printf(const char *format, ...) XINE_FORMAT_PRINTF(1, 2); #endif /* _LOG_H_ */ diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 8ab661d3e..30cdadc7c 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -137,10 +137,7 @@ static int sock_data_write(xine_t *xine, int socket, char *buf, int len) { return wlen; } -static int -#ifdef __GNUC__ -__attribute__((format (printf, 3, 4))) -#endif +static int XINE_FORMAT_PRINTF(3, 4) sock_string_write(xine_t *xine, int socket, char *msg, ...) { char buf[_BUFSIZ]; va_list args; @@ -182,10 +179,7 @@ static void broadcaster_data_write(broadcaster_t *this, char *buf, int len) { } } -static void -#ifdef __GNUC__ -__attribute__((format (printf, 2, 3))) -#endif +static void XINE_FORMAT_PRINTF(2, 3) broadcaster_string_write(broadcaster_t *this, char *msg, ...) { char buf[_BUFSIZ]; va_list args; diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index 4d22226ac..b533286c8 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -69,4 +69,16 @@ # endif #endif +/* Format attributes */ +#ifdef SUPPORT_ATTRIBUTE_FORMAT +# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((format(printf, fmt, var))) +#else +# define XINE_FORMAT_PRINTF(fmt,var) +#endif +#ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG +# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((format_arg(fmt))) +#else +# define XINE_FORMAT_PRINTF_ARG(fmt) +#endif + #endif /* ATTRIBUTE_H_ */ diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c index 43e046a45..f6a0498e8 100644 --- a/src/xine-utils/xine_check.c +++ b/src/xine-utils/xine_check.c @@ -72,10 +72,7 @@ #endif /* !__linux__ */ -static void -#ifdef __GNUC__ -__attribute__((format (printf, 3, 4))) -#endif +static void XINE_FORMAT_PRINTF(3, 4) set_hc_result(xine_health_check_t* hc, int state, const char *format, ...) { -- cgit v1.2.3 From b56784ba37622f28147b6a10c7ba77f9c9fbf2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 7 Apr 2007 20:12:19 +0200 Subject: video_overlay_s uses C's inheritance-like definition, so the first field has to be video_overlay. --- src/xine-engine/video_overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index 04a3034a3..7bd9292c8 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -49,10 +49,10 @@ typedef struct video_overlay_showing_s { typedef struct video_overlay_s { - xine_t *xine; - video_overlay_manager_t video_overlay; + xine_t *xine; + pthread_mutex_t events_mutex; video_overlay_events_t events[MAX_EVENTS]; pthread_mutex_t objects_mutex; -- cgit v1.2.3