From 25d9545cf333b4bc0b60d835b043c15fe878548a Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 5 Jul 2005 14:54:19 +0000 Subject: [PATCH] sys/v4l/: Port from 0.8. Original commit message from CVS: 2005-07-05 Andy Wingo * sys/v4l/: Port from 0.8. --- ChangeLog | 2 ++ configure.ac | 1 + po/af.po | 10 ++++---- po/az.po | 10 ++++---- po/cs.po | 10 ++++---- po/en_GB.po | 10 ++++---- po/hu.po | 10 ++++---- po/it.po | 10 ++++---- po/nb.po | 10 ++++---- po/nl.po | 10 ++++---- po/or.po | 10 ++++---- po/sq.po | 10 ++++---- po/sr.po | 10 ++++---- po/sv.po | 12 +++++----- po/uk.po | 10 ++++---- po/vi.po | 10 ++++---- sys/Makefile.am | 14 ++++++----- sys/v4l/gstv4lsrc.c | 61 +++++++++++++++++++++++++++++++----------------- sys/v4l/gstv4ltuner.c | 4 ++-- sys/v4l/gstv4lxoverlay.c | 3 ++- 20 files changed, 126 insertions(+), 101 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95a1178..e840079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-07-05 Andy Wingo + * sys/v4l/: Port from 0.8. + * Many files: Null if we got it.... 2005-07-05 Andy Wingo diff --git a/configure.ac b/configure.ac index 198ba49..922a27c 100644 --- a/configure.ac +++ b/configure.ac @@ -903,6 +903,7 @@ gst/volume/Makefile sys/Makefile sys/ximage/Makefile sys/xvimage/Makefile +sys/v4l/Makefile ext/Makefile ext/alsa/Makefile ext/cdparanoia/Makefile diff --git a/po/af.po b/po/af.po index 92414cf..f56bd7b 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.7.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-03-18 14:16+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" @@ -68,21 +68,21 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Kon nie CD-toestel oopmaak om te lees nie." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, fuzzy, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Kon nie vfs-lêer \"%s\" oopmaak vir skryf nie." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 #, fuzzy msgid "No filename given" msgstr "Geen lêernaam gespesifiseer." -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Kon nie vfs-lêer \"%s\" toemaak nie." diff --git a/po/az.po b/po/az.po index fdd1e08..d62b2d0 100644 --- a/po/az.po +++ b/po/az.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-03-19 18:29+0200\n" "Last-Translator: Metin Amiroff \n" "Language-Team: Azerbaijani \n" @@ -69,21 +69,21 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "CD avadanlığı oxuma üçün açıla bilmədi." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, fuzzy, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "\"%s\" vfs faylı yazma üçün açıla bilmədi." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 #, fuzzy msgid "No filename given" msgstr "Fayl adı verilməyib." -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "\"%s\" vfs faylı bağlana bilmədi." diff --git a/po/cs.po b/po/cs.po index e92598c..a527487 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-08-08 22:58+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" @@ -71,20 +71,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Nemohu otevřít zařízení CD pro čtení." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Nemohu otevřít soubor vfs \"%s\" pro zápis: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Nezadán název souboru" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Nemohu zavřít soubor vfs \"%s\"." diff --git a/po/en_GB.po b/po/en_GB.po index a8460af..85dcb3a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-04-26 10:41-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" @@ -67,20 +67,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Could not open CD device for reading." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, fuzzy, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Could not open vfs file \"%s\" for writing." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "No filename given" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Could not close vfs file \"%s\"." diff --git a/po/hu.po b/po/hu.po index 819108c..cd2d7d1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-07-18 11:03+0200\n" "Last-Translator: Laszlo Dvornik \n" "Language-Team: Hungarian \n" @@ -67,20 +67,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Nem lehet olvasásra megnyitni a CD-eszközt." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Nem lehet írásra megnyitni a(z) \"%s\" vfs-fájlt: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Nincs fájlnév megadva" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Nem lehet bezárni a(z) \"%s\" vfs-fájlt." diff --git a/po/it.po b/po/it.po index 30ea8ac..602b098 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-11-07 19:11+0100\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -68,20 +68,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Impossibile aprire il device CD in lettura." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Impossibile aprire il file vfs «%s» in scrittura: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Nessun nome di file fornito" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Impossibile chiudere il file vfs «%s»." diff --git a/po/nb.po b/po/nb.po index c0eef1d..56d7d3b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-10-04 15:54+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmaal \n" @@ -67,20 +67,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Kunne ikke Ã¥pne CD-enheten for lesing." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Kunne ikke Ã¥pne VFS-fil «%s» for skriving: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Ingen filnavn oppgitt" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Kunne ikke lukke VFS-fil «%s»." diff --git a/po/nl.po b/po/nl.po index 1a7aa6d..12698ed 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-08-05 16:26+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -68,20 +68,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Kon het CD-apparaat niet openen om te lezen." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Kon het VFS-bestand \"%s\" niet openen om te schrijven: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Geen bestandsnaam opgegeven" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Kon het VFS-bestand \"%s\" niet sluiten." diff --git a/po/or.po b/po/or.po index f714e26..2ca4dc6 100644 --- a/po/or.po +++ b/po/or.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-09-27 13:32+0530\n" "Last-Translator: Gora Mohanty \n" "Language-Team: Oriya \n" @@ -69,20 +69,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "ସି.ଡି. ଯନ୍ତ୍ର ପଢ଼ିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "ଭି.ଏଫ.ଏସ. ଫାଇଲ \"%s\" ଲେଖିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "କୌଣସି ଫାଇଲନାମ ଦିଆଯାଇ ନାହିଁ" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "ଭି.ଏଫ.ଏସ. ଫାଇଲ \"%s\" ବନ୍ଦ କରିହେଲା ନାହିଁ." diff --git a/po/sq.po b/po/sq.po index 4b48408..a65ed93 100644 --- a/po/sq.po +++ b/po/sq.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-08-07 20:29+0200\n" "Last-Translator: Laurent Dhima \n" "Language-Team: Albanian \n" @@ -67,20 +67,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "I pamundur hapja e dispozitivit CD për lexim." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "E pamundur hapja e file vfs \"%s\" për shkrim: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Nuk është dhënë asnjë emër file" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "E pamundur mbyllja e file vfs \"%s\"." diff --git a/po/sr.po b/po/sr.po index 5782c28..95cce87 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.7.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-03-13 00:18+0100\n" "Last-Translator: Danilo Segan \n" "Language-Team: Serbian \n" @@ -69,21 +69,21 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Не могу да отворим ЦД уређај ради читања." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, fuzzy, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Не могу да отворим ВСД датотеку „%s“ ради уписа." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 #, fuzzy msgid "No filename given" msgstr "Име датотеке није задато." -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Не могу да затворим ВСД датотеку „%s“." diff --git a/po/sv.po b/po/sv.po index b56bc61..b0d55a0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,13 +2,13 @@ # Copyright (C) 2004 Free Software Foundation, Inc. # Christian Rose , 2004. # -# $Id: sv.po,v 1.22 2005/06/29 13:35:04 thomasvs Exp $ +# $Id: sv.po,v 1.23 2005/07/05 14:54:19 wingo Exp $ # msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-08-03 20:53+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -72,20 +72,20 @@ msgstr "Ingen skiva" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Kunde inte öppna cd-enheten för läsning." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Kunde inte öppna vfs-filen \"%s\" för skrivning: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Inget filnamn angivet" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Kunde inte stänga vfs-filen \"%s\"." diff --git a/po/uk.po b/po/uk.po index 85dbd9b..b3faa0e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2004-08-03 15:40+0200\n" "Last-Translator: Maxim V. Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -68,21 +68,21 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Не вдається відкрити пристрій компакт-дисків для читання." -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "" "Не вдається відкрити файл віртуальної файлової системи \"%s\" для запису: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "Не вказано файл" -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Не вдається закрити файл віртуальної файлової системи \"%s\"." diff --git a/po/vi.po b/po/vi.po index af0e6e5..a080960 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-19 11:41+0200\n" +"POT-Creation-Date: 2005-07-05 13:29+0200\n" "PO-Revision-Date: 2005-01-22 17:17+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -69,20 +69,20 @@ msgstr "" msgid "CDDA discid for metadata retrieval" msgstr "" -#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699 +#: ext/cdparanoia/gstcdparanoia.c:682 ext/cdparanoia/gstcdparanoia.c:698 msgid "Could not open CD device for reading." msgstr "Đã không mở được thiết bị CD để đọc" -#: ext/gnomevfs/gstgnomevfssink.c:432 +#: ext/gnomevfs/gstgnomevfssink.c:430 #, c-format msgid "Could not open vfs file \"%s\" for writing: %s." msgstr "Đã không mở được tập tin vfs \"%s\" để ghi: %s." -#: ext/gnomevfs/gstgnomevfssink.c:439 +#: ext/gnomevfs/gstgnomevfssink.c:437 msgid "No filename given" msgstr "ChÆ°a nhập tên tập tin " -#: ext/gnomevfs/gstgnomevfssink.c:467 +#: ext/gnomevfs/gstgnomevfssink.c:465 #, c-format msgid "Could not close vfs file \"%s\"." msgstr "Đã không đóng được tập tin vfs \"%s\"." diff --git a/sys/Makefile.am b/sys/Makefile.am index f68ce99..cc10bd6 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -1,8 +1,8 @@ -# if USE_GST_V4L -# V4L_DIR=v4l -# else -# V4L_DIR= -# endif +if USE_GST_V4L +V4L_DIR=v4l +else +V4L_DIR= +endif if USE_X XIMAGE_DIR=ximage @@ -18,9 +18,11 @@ endif SUBDIRS = \ $(XIMAGE_DIR) \ - $(XVIMAGE_DIR) + $(XVIMAGE_DIR) \ + $(V4L_DIR) DIST_SUBDIRS = \ + v4l \ ximage \ xvimage diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index 31ee5ee..53994cc 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -214,6 +214,10 @@ gst_v4lsrc_class_init (GstV4lSrcClass * klass) g_param_spec_boolean ("autoprobe-fps", "Autoprobe FPS", "Whether the device should be probed for framerates", TRUE, G_PARAM_READWRITE)); + /* FIXME: this should have been a 64 bit int instead, because 3 seconds + * overflows 32 bit nanosecond values. However, this is an ABI change, + * so we're saving it for 0.9, and then we can also rename the property + * to something that makes more sense, like, timestamp-offset */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LATENCY_OFFSET, g_param_spec_int ("latency-offset", "Latency offset", "A latency offset subtracted from timestamps set on buffers (in ns)", @@ -286,6 +290,21 @@ gst_v4lsrc_init (GstV4lSrc * v4lsrc) v4lsrc->fps_list = NULL; } +static gint all_palettes[] = { + VIDEO_PALETTE_YUV422, + VIDEO_PALETTE_YUV420P, + VIDEO_PALETTE_UYVY, + VIDEO_PALETTE_YUV411P, + VIDEO_PALETTE_YUV422P, + VIDEO_PALETTE_YUV410P, + VIDEO_PALETTE_YUV411, + VIDEO_PALETTE_RGB555, + VIDEO_PALETTE_RGB565, + VIDEO_PALETTE_RGB24, + VIDEO_PALETTE_RGB32, + -1 +}; + static void gst_v4lsrc_open (GstElement * element, const gchar * device) { @@ -293,31 +312,17 @@ gst_v4lsrc_open (GstElement * element, const gchar * device) GstV4lElement *v4l = GST_V4LELEMENT (v4lsrc); gint width = v4l->vcap.minwidth; gint height = v4l->vcap.minheight; - - int palette[] = { - VIDEO_PALETTE_YUV422, - VIDEO_PALETTE_YUV420P, - VIDEO_PALETTE_UYVY, - VIDEO_PALETTE_YUV411P, - VIDEO_PALETTE_YUV422P, - VIDEO_PALETTE_YUV410P, - VIDEO_PALETTE_YUV411, - VIDEO_PALETTE_RGB555, - VIDEO_PALETTE_RGB565, - VIDEO_PALETTE_RGB24, - VIDEO_PALETTE_RGB32, - -1 - }, i; + gint i; GST_DEBUG_OBJECT (v4lsrc, "Checking supported palettes"); - for (i = 0; palette[i] != -1; i++) { + for (i = 0; all_palettes[i] != -1; i++) { /* try palette out */ - if (!gst_v4lsrc_try_capture (v4lsrc, width, height, palette[i])) + if (!gst_v4lsrc_try_capture (v4lsrc, width, height, all_palettes[i])) continue; GST_DEBUG_OBJECT (v4lsrc, "Added palette %d (%s) to supported list", - palette[i], gst_v4lsrc_palette_name (palette[i])); + all_palettes[i], gst_v4lsrc_palette_name (all_palettes[i])); v4lsrc->colourspaces = g_list_append (v4lsrc->colourspaces, - GINT_TO_POINTER (palette[i])); + GINT_TO_POINTER (all_palettes[i])); } GST_DEBUG_OBJECT (v4lsrc, "%d palette(s) supported", g_list_length (v4lsrc->colourspaces)); @@ -552,6 +557,20 @@ gst_v4lsrc_palette_to_caps (int palette) return caps; } +static GstCaps * +gst_v4lsrc_get_any_caps () +{ + gint i; + GstCaps *caps = gst_caps_new_empty (), *one; + + for (i = 0; all_palettes[i] != -1; i++) { + one = gst_v4lsrc_palette_to_caps (all_palettes[i]); + gst_caps_append (caps, one); + } + + return caps; +} + static GstPadLinkReturn gst_v4lsrc_src_link (GstPad * pad, const GstCaps * vscapslist) { @@ -764,11 +783,11 @@ gst_v4lsrc_getcaps (GstPad * pad) GList *item; if (!GST_V4L_IS_OPEN (GST_V4LELEMENT (v4lsrc))) { - return gst_caps_new_any (); + return gst_v4lsrc_get_any_caps (); } if (!v4lsrc->autoprobe) { /* FIXME: query current caps and return those, with _any appended */ - return gst_caps_new_any (); + return gst_v4lsrc_get_any_caps (); } fps = gst_v4lsrc_get_fps (v4lsrc); diff --git a/sys/v4l/gstv4ltuner.c b/sys/v4l/gstv4ltuner.c index f02c5da..37a2748 100644 --- a/sys/v4l/gstv4ltuner.c +++ b/sys/v4l/gstv4ltuner.c @@ -310,7 +310,7 @@ gst_v4l_tuner_signal_strength (GstTuner * tuner, GstTunerChannel * channel) GstV4lElement *v4lelement = GST_V4LELEMENT (tuner); GstV4lTunerChannel *v4lchannel = GST_V4L_TUNER_CHANNEL (channel); gint chan; - gint signal = 0; + guint signal = 0; /* assert that we're opened and that we're using a known item */ g_return_val_if_fail (GST_V4L_IS_OPEN (v4lelement), 0); @@ -325,5 +325,5 @@ gst_v4l_tuner_signal_strength (GstTuner * tuner, GstTunerChannel * channel) gst_v4l_get_signal (v4lelement, v4lchannel->tuner, &signal); } - return signal; + return (gint) signal; } diff --git a/sys/v4l/gstv4lxoverlay.c b/sys/v4l/gstv4lxoverlay.c index 8f5c75e..5fe5cf7 100644 --- a/sys/v4l/gstv4lxoverlay.c +++ b/sys/v4l/gstv4lxoverlay.c @@ -66,7 +66,8 @@ gst_v4l_xoverlay_open (GstV4lElement * v4lelement) struct stat s; GstV4lXv *v4lxv; const gchar *name = g_getenv ("DISPLAY"); - int ver, rel, req, ev, err, anum, i, id = 0, first_id = 0, min; + unsigned int ver, rel, req, ev, err, anum; + int i, id = 0, first_id = 0, min; XvAdaptorInfo *ai; Display *dpy; -- 2.7.4