From f3fd919f2b4d4e5d899f1fcdddb2120498c3241d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 11 Jan 2005 14:55:34 +0000 Subject: Clock fixes. Original commit message from CVS: Clock fixes. Added seeking in theora/vorbis ogg files. Make playbin compile. --- ChangeLog | 47 ++++++++++++++++++++++++++ configure.ac | 2 +- examples/seeking/seek.c | 73 ++++++++++++++++++++++++++++++++++++++++- gst-libs/gst/audio/audioclock.c | 15 +++++---- po/af.po | 14 ++++---- po/az.po | 14 ++++---- po/cs.po | 14 ++++---- po/en_GB.po | 14 ++++---- po/hu.po | 14 ++++---- po/it.po | 14 ++++---- po/nb.po | 14 ++++---- po/nl.po | 14 ++++---- po/or.po | 14 ++++---- po/sq.po | 14 ++++---- po/sr.po | 14 ++++---- po/sv.po | 16 ++++----- po/uk.po | 14 ++++---- 17 files changed, 221 insertions(+), 100 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe99f0dee..5b504353d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +2005-01-11 Wim Taymans + + * configure.ac: + * examples/seeking/seek.c: (dynamic_link), (make_vorbis_pipeline), + (make_theora_pipeline), (make_vorbis_theora_pipeline), (do_seek): + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_get_type), + (gst_ogg_pad_init), (gst_ogg_pad_dispose), (gst_ogg_pad_src_query), + (gst_ogg_pad_event), (gst_ogg_demux_factory_filter), + (compare_ranks), (gst_ogg_pad_internal_chain), + (gst_ogg_pad_typefind), (gst_ogg_pad_submit_packet), + (gst_ogg_pad_submit_page), (gst_ogg_chain_new), + (gst_ogg_chain_free), (gst_ogg_chain_new_stream), + (gst_ogg_chain_get_stream), (gst_ogg_chain_has_stream), + (gst_ogg_demux_base_init), (gst_ogg_demux_init), + (gst_ogg_demux_submit_buffer), (gst_ogg_demux_seek), + (gst_ogg_demux_get_data), (gst_ogg_demux_get_next_page), + (gst_ogg_demux_get_prev_page), + (gst_ogg_demux_deactivate_current_chain), + (gst_ogg_demux_activate_chain), (gst_ogg_demux_perform_seek), + (gst_ogg_demux_bisect_forward_serialno), + (gst_ogg_demux_read_chain), (gst_ogg_demux_read_end_chain), + (gst_ogg_demux_find_pad), (gst_ogg_demux_find_chain), + (gst_ogg_demux_find_chains), (gst_ogg_demux_chain_unlocked), + (gst_ogg_demux_chain), (gst_ogg_demux_send_eos), + (gst_ogg_demux_loop), (gst_ogg_demux_sink_activate), + (gst_ogg_print): + * ext/theora/theoradec.c: (_inc_granulepos), + (theora_dec_sink_event), (theora_dec_chain): + * gst-libs/gst/audio/audioclock.c: (gst_audio_clock_class_init): + * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init), + (gst_play_base_bin_init), (gen_source_element), (setup_source), + (play_base_eos), (gst_play_base_bin_change_state), + (gst_play_base_bin_add_element), + (gst_play_base_bin_remove_element): + * gst/playback/gstplaybin.c: (gst_play_bin_init), + (gst_play_bin_send_event): + * gst/playback/gststreaminfo.c: (gst_stream_info_dispose): + * sys/oss/gstosselement.c: (gst_osselement_parse_caps), + (gst_osselement_open_audio): + * sys/oss/gstosssink.c: (gst_osssink_init), (gst_osssink_setcaps), + (gst_osssink_finish_preroll), (gst_osssink_handle_event), + (gst_osssink_chain), (gst_osssink_change_state): + Clock fixes. + Added seeking in theora/vorbis ogg files. + Make playbin compile. + + 2005-01-07 Wim Taymans * ext/ogg/gstoggdemux.c: (gst_ogg_pad_get_type), diff --git a/configure.ac b/configure.ac index dd4a8036b..67d2155b4 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 8, 6, 1, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gst-plugins-threaded, GST_PLUGINS_VERSION, 0, 9, 0, 0, GST_CVS="no", GST_CVS="yes") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) diff --git a/examples/seeking/seek.c b/examples/seeking/seek.c index eecfbd711..f171d0c1a 100644 --- a/examples/seeking/seek.c +++ b/examples/seeking/seek.c @@ -317,12 +317,14 @@ make_theora_pipeline (const gchar * location) { GstElement *pipeline, *video_bin; GstElement *src, *demux, *decoder, *convert, *videosink; + GstElement *queue; GstPad *seekable; pipeline = gst_pipeline_new ("app"); src = gst_element_factory_make_or_warn (SOURCE, "src"); demux = gst_element_factory_make_or_warn ("oggdemux", "demux"); + queue = gst_element_factory_make_or_warn ("queue", "queue"); decoder = gst_element_factory_make_or_warn ("theoradec", "decoder"); convert = gst_element_factory_make_or_warn ("ffmpegcolorspace", "convert"); videosink = gst_element_factory_make_or_warn ("xvimagesink", "sink"); @@ -333,16 +335,18 @@ make_theora_pipeline (const gchar * location) gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), demux); + gst_bin_add (GST_BIN (pipeline), queue); gst_bin_add (GST_BIN (video_bin), decoder); gst_bin_add (GST_BIN (video_bin), convert); gst_bin_add (GST_BIN (video_bin), videosink); gst_bin_add (GST_BIN (pipeline), video_bin); gst_element_link (src, demux); + gst_element_link (queue, decoder); gst_element_link (decoder, convert); gst_element_link (convert, videosink); - setup_dynamic_link (demux, NULL, gst_element_get_pad (decoder, "sink"), NULL); + setup_dynamic_link (demux, NULL, gst_element_get_pad (queue, "sink"), NULL); seekable = gst_element_get_pad (decoder, "src"); seekable_pads = g_list_prepend (seekable_pads, seekable); @@ -351,6 +355,72 @@ make_theora_pipeline (const gchar * location) return pipeline; } + +static GstElement * +make_vorbis_theora_pipeline (const gchar * location) +{ + GstElement *pipeline, *audio_bin, *video_bin; + GstElement *src, *demux, *a_decoder, *a_convert, *v_decoder, *v_convert; + GstElement *audiosink, *videosink; + GstElement *a_queue, *v_queue; + GstPad *seekable; + + pipeline = gst_pipeline_new ("app"); + + src = gst_element_factory_make_or_warn (SOURCE, "src"); + g_object_set (G_OBJECT (src), "location", location, NULL); + + demux = gst_element_factory_make_or_warn ("oggdemux", "demux"); + + gst_bin_add (GST_BIN (pipeline), src); + gst_bin_add (GST_BIN (pipeline), demux); + gst_element_link (src, demux); + + audio_bin = gst_bin_new ("a_decoder_bin"); + a_queue = gst_element_factory_make_or_warn ("queue", "a_queue"); + a_decoder = gst_element_factory_make_or_warn ("vorbisdec", "a_dec"); + a_convert = gst_element_factory_make_or_warn ("audioconvert", "a_convert"); + audiosink = gst_element_factory_make_or_warn ("osssink", "a_sink"); + + gst_element_link (a_queue, a_decoder); + gst_element_link (a_decoder, a_convert); + gst_element_link (a_convert, audiosink); + + gst_bin_add (GST_BIN (audio_bin), a_queue); + gst_bin_add (GST_BIN (audio_bin), a_decoder); + gst_bin_add (GST_BIN (audio_bin), a_convert); + gst_bin_add (GST_BIN (audio_bin), audiosink); + + gst_bin_add (GST_BIN (pipeline), audio_bin); + + setup_dynamic_link (demux, NULL, gst_element_get_pad (a_queue, "sink"), NULL); + + video_bin = gst_bin_new ("v_decoder_bin"); + v_queue = gst_element_factory_make_or_warn ("queue", "v_queue"); + v_decoder = gst_element_factory_make_or_warn ("theoradec", "v_dec"); + v_convert = + gst_element_factory_make_or_warn ("ffmpegcolorspace", "v_convert"); + videosink = gst_element_factory_make_or_warn ("xvimagesink", "v_sink"); + gst_element_link_many (v_queue, v_decoder, v_convert, videosink, NULL); + + gst_bin_add (GST_BIN (video_bin), v_queue); + gst_bin_add (GST_BIN (video_bin), v_decoder); + gst_bin_add (GST_BIN (video_bin), v_convert); + gst_bin_add (GST_BIN (video_bin), videosink); + + gst_bin_add (GST_BIN (pipeline), video_bin); + + setup_dynamic_link (demux, NULL, gst_element_get_pad (v_queue, "sink"), NULL); + + seekable = gst_element_get_pad (a_decoder, "src"); + seekable_pads = g_list_prepend (seekable_pads, seekable); + rate_pads = g_list_prepend (rate_pads, seekable); + rate_pads = + g_list_prepend (rate_pads, gst_element_get_pad (a_decoder, "sink")); + + return pipeline; +} + static GstElement * make_mp3_pipeline (const gchar * location) { @@ -972,6 +1042,7 @@ static Pipeline pipelines[] = { {"mpegparse", make_parse_pipeline}, {"vorbis", make_vorbis_pipeline}, {"theora", make_theora_pipeline}, + {"ogg/v/t", make_vorbis_theora_pipeline}, {"sid", make_sid_pipeline}, {"flac", make_flac_pipeline}, {"wav", make_wav_pipeline}, diff --git a/gst-libs/gst/audio/audioclock.c b/gst-libs/gst/audio/audioclock.c index 65d2694f2..9510f6e2d 100644 --- a/gst-libs/gst/audio/audioclock.c +++ b/gst-libs/gst/audio/audioclock.c @@ -30,10 +30,11 @@ static void gst_audio_clock_class_init (GstAudioClockClass * klass); static void gst_audio_clock_init (GstAudioClock * clock); static GstClockTime gst_audio_clock_get_internal_time (GstClock * clock); -static GstClockEntryStatus gst_audio_clock_id_wait_async (GstClock * clock, - GstClockEntry * entry); -static void gst_audio_clock_id_unschedule (GstClock * clock, - GstClockEntry * entry); + +//static GstClockEntryStatus gst_audio_clock_id_wait_async (GstClock * clock, +// GstClockEntry * entry); +//static void gst_audio_clock_id_unschedule (GstClock * clock, +// GstClockEntry * entry); static GstSystemClockClass *parent_class = NULL; @@ -79,8 +80,8 @@ gst_audio_clock_class_init (GstAudioClockClass * klass) parent_class = g_type_class_ref (GST_TYPE_SYSTEM_CLOCK); gstclock_class->get_internal_time = gst_audio_clock_get_internal_time; - gstclock_class->wait_async = gst_audio_clock_id_wait_async; - gstclock_class->unschedule = gst_audio_clock_id_unschedule; + //gstclock_class->wait_async = gst_audio_clock_id_wait_async; + //gstclock_class->unschedule = gst_audio_clock_id_unschedule; } static void @@ -178,6 +179,7 @@ gst_audio_clock_update_time (GstAudioClock * aclock, GstClockTime time) } } +#if 0 static gint compare_clock_entries (GstClockEntry * entry1, GstClockEntry * entry2) { @@ -203,3 +205,4 @@ gst_audio_clock_id_unschedule (GstClock * clock, GstClockEntry * entry) aclock->async_entries = g_slist_remove (aclock->async_entries, entry); } +#endif diff --git a/po/af.po b/po/af.po index 249a8bc7e..fd309f29a 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-03-18 14:16+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" @@ -184,32 +184,32 @@ msgstr "Kon nie video-toestel \"%s\" toemaak nie." msgid "Could not write to device \"%s\"." msgstr "Kon nie skryf na toestel \"%s\" nie." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "OSS-toestel \"%s\" is reeds in gebruik deur 'n ander program." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "Kon nie toegang kry tot toestel \"%s\" nie, kyk na toegangsregte." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Toestel \"%s\" bestaan nie." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Kon nie toestel \"%s\" oopmaak vir skryf nie." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Kon nie toestel \"%s\" oopmaak vir lees nie." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "" diff --git a/po/az.po b/po/az.po index 919761faf..1a879726a 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-03-19 18:29+0200\n" "Last-Translator: Metin Amiroff \n" "Language-Team: Azerbaijani \n" @@ -185,32 +185,32 @@ msgstr "\"%s\" video avadanlığı bağlana bilmədi." msgid "Could not write to device \"%s\"." msgstr "\"%s\" avadanlığına yazıla bilmədi." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "\"%s\" OSS avadanlığı başqa bir proqram tərəfindən istifadədədir." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "\"%s\" avadanlığına yetişə bilmədi, səlahiyyətlərini yoxlayın." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "\"%s\" avadanlığı mövcud deyil." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "\"%s\" avadanlığı yazma üçün açıla bilmədi." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "\"%s\" avadanlığı oxuma üçün açıla bilmədi." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "" diff --git a/po/cs.po b/po/cs.po index 22af7c082..4a34aeb03 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-08-08 22:58+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" @@ -190,32 +190,32 @@ msgstr "Nemohu zavřít zařízení videa \"%s\"." msgid "Could not write to device \"%s\"." msgstr "Nemohu zapisovat do zařízení \"%s\"." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "Zařízení OSS \"%s\" již používá jiný program." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "Nemohu přistupovat k zařízení \"%s\", zkontrolujte jeho oprávnění." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Zařízení \"%s\" neexistuje." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Nemohu otevřít zažízení \"%s\" pro zápis." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Nemohu otevřít zažízení \"%s\" pro čtení." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "Vaše zařízení OSS nebylo možné správně najít" diff --git a/po/en_GB.po b/po/en_GB.po index 0ea94e557..e98331027 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-04-26 10:41-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" @@ -182,32 +182,32 @@ msgstr "Could not close video device \"%s\"." msgid "Could not write to device \"%s\"." msgstr "Could not write to device \"%s\"." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "OSS device \"%s\" is already in use by another program." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "Could not access device \"%s\", check its permissions." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Device \"%s\" does not exist." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Could not open device \"%s\" for writing." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Could not open device \"%s\" for reading." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 #, fuzzy msgid "Your OSS device could not be probed correctly" msgstr "Your oss device could not be probed correctly" diff --git a/po/hu.po b/po/hu.po index 7cd5d3b43..a9a0d12d8 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-07-18 11:03+0200\n" "Last-Translator: Laszlo Dvornik \n" "Language-Team: Hungarian \n" @@ -182,33 +182,33 @@ msgstr "Nem lehet lezárni a(z) \"%s\" videoeszközt." msgid "Could not write to device \"%s\"." msgstr "Nem lehet írni a(z) \"%s\" eszközre." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "A(z) \"%s\" OSS-eszközt már használja egy másik program." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "" "Nem lehet hozzáférni a(z) \"%s\" eszközhöz, ellenőrizze a jogosultságait." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "A(z) \"%s\" eszköz nem létezik." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Nem lehet írásra megnyitni a(z) \"%s\" eszközt." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Nem lehet olvasásra megnyitni a(z) \"%s\" eszközt." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 #, fuzzy msgid "Your OSS device could not be probed correctly" msgstr "Az Ön OSS-eszközét nem lehet megfelelően ellenőrizni" diff --git a/po/it.po b/po/it.po index 13a3dbdc6..139ac16bd 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-11-07 19:11+0100\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -188,32 +188,32 @@ msgstr "Impossibile chiudere il device video «%s»." msgid "Could not write to device \"%s\"." msgstr "Impossibile scrivere sul device «%s»." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "Il device OSS «%s» è già usato da un altro programma." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "Impossibile accedere al device «%s», verificare i suoi permessi." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Il device «%s» non esiste." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Impossibile aprire il device «%s» in scrittura." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Impossibile aprire il device «%s» in lettura." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "Il device OSS non può essere sondato in modo corretto" diff --git a/po/nb.po b/po/nb.po index 733cb8e7d..ac109e999 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-10-04 15:54+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmaal \n" @@ -181,32 +181,32 @@ msgstr "" msgid "Could not write to device \"%s\"." msgstr "" -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "" -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "" -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Enhet «%s» eksisterer ikke." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "" -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "" -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "" diff --git a/po/nl.po b/po/nl.po index e38436b12..06d061e55 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-08-05 16:26+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -188,33 +188,33 @@ msgstr "Kon videoapparaat \"%s\" niet sluiten." msgid "Could not write to device \"%s\"." msgstr "Kon niet schrijven naar apparaat \"%s\"." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "OSS-apparaat \"%s\" is al in gebruik door een ander programma." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "" "Kon geen toegang krijgen tot apparaat \"%s\", controleer de toegangsrechten." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Apparaat \"%s\" bestaat niet." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Kon apparaat \"%s\" niet openen om te schrijven." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Kon apparaat \"%s\" niet openen om te lezen." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "Uw OSS-apparaat kon niet correct worden gevonden" diff --git a/po/or.po b/po/or.po index 4e9b79a34..fcd211050 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-09-27 13:32+0530\n" "Last-Translator: Gora Mohanty \n" "Language-Team: Oriya \n" @@ -188,32 +188,32 @@ msgstr "\"%s\" ଭିଡିଓ ଯନ୍ତ୍ର ବନ୍ଦ କରିହେ msgid "Could not write to device \"%s\"." msgstr "\"%s\" ଯନ୍ତ୍ରରେ ଲେଖିହେଲା ନାହିଁ." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "\"%s\" ଓ.ଏସ.ଏସ. ଯନ୍ତ୍ର ପୂର୍ବରୁ ଅନ୍ଯ କାରିକା ଦ୍ବାରା ବ୍ଯବହାର କରାଯାଉଛି." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "\"%s\" ଯନ୍ତ୍ର ବ୍ଯବହାର କରିହେଲା ନାହିଁ, ତାହାର ଅନୁମତି ଦେଖନ୍ତୁ." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "\"%s\" ଯନ୍ତ୍ର ଅବସ୍ଥିତ ନାହିଁ." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "\"%s\" ଯନ୍ତ୍ର ଲେଖିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "\"%s\" ଯନ୍ତ୍ର ପଢ଼ିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "ଆପଣଙ୍କର ଓ.ଏସ.ଏସ. ଯନ୍ତ୍ରର ଠିକ ଭାବରେ ଅନୁସନ୍ଧାନ କରିହେଲା ନାହିଁ." diff --git a/po/sq.po b/po/sq.po index 5b72dae4f..46a2ed607 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-08-07 20:29+0200\n" "Last-Translator: Laurent Dhima \n" "Language-Team: Albanian \n" @@ -187,32 +187,32 @@ msgstr "E pamundur mbyllja e dispozitivit video \"%s\"." msgid "Could not write to device \"%s\"." msgstr "I pamundur shkrimi në dispozitivin \"%s\"." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "Dispozitivi OSS \"%s\" është duke u përdorur nga një tjetër program." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "E pamundur futja në dispozitivin \"%s\", kontrollo të drejtat e tij." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Dispozitivi \"%s\" nuk ekziston." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "E pamundur hapja e dispozitivit \"%s\" për shkrim." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "E pamundur hapja e dispozitivit \"%s\" për lexim." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "Dispozitivi juaj OSS mund të mos provohet korrektësisht" diff --git a/po/sr.po b/po/sr.po index 9eb610ffc..229cdfb05 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-03-13 00:18+0100\n" "Last-Translator: Danilo Segan \n" "Language-Team: Serbian \n" @@ -186,32 +186,32 @@ msgstr "Не могу да затворим видео уређај „%s“." msgid "Could not write to device \"%s\"." msgstr "Не могу да пишем на видео уређај „%s“." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "OSS уређај „%s“ већ користи неки програм." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "Не могу да приступим уређају „%s“, проверите његова овлашћења." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Не постоји уређај „%s“." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Не могу да отворим уређај „%s“ ради уписа." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Не могу да отворим уређај „%s“ ради читања." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "" diff --git a/po/sv.po b/po/sv.po index 1b06d2310..338d92d97 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.15 2004/11/25 18:55:57 thomasvs Exp $ +# $Id: sv.po,v 1.15.2.1 2005/01/11 14:55:34 wtay Exp $ # msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-08-03 20:53+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -192,32 +192,32 @@ msgstr "Kunde inte stänga vidoeenheten \"%s\"." msgid "Could not write to device \"%s\"." msgstr "Kunde inte skriva till enheten \"%s\"." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "OSS-enheten \"%s\" används redan av ett annat program." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "Kunde inte komma åt enheten \"%s\". Kontrollera dess rättigheter." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Enheten \"%s\" finns inte." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Kunde inte öppna enheten \"%s\" för skrivning." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Kunde inte öppna enheten \"%s\" för läsning." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 msgid "Your OSS device could not be probed correctly" msgstr "Din OSS-enhet kunde inte undersökas korrekt" diff --git a/po/uk.po b/po/uk.po index 6db3dd0d8..7c8111fb0 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: 2004-11-12 19:06+0100\n" +"POT-Creation-Date: 2005-01-11 12:11+0100\n" "PO-Revision-Date: 2004-08-03 15:40+0200\n" "Last-Translator: Maxim V. Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -185,34 +185,34 @@ msgstr "Не вдається закрити відео пристрій \"%s\". msgid "Could not write to device \"%s\"." msgstr "Не вдається записати у пристрій \"%s\"." -#: sys/oss/gstosselement.c:725 +#: sys/oss/gstosselement.c:730 #, c-format msgid "OSS device \"%s\" is already in use by another program." msgstr "OSS пристрій \"%s\" вже використовується іншою програмою." -#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736 +#: sys/oss/gstosselement.c:737 sys/oss/gstosselement.c:741 #, c-format msgid "Could not access device \"%s\", check its permissions." msgstr "" "Не вдається отримати доступ до пристрою \"%s\", перевірте права доступу до " "нього." -#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:168 +#: sys/oss/gstosselement.c:748 sys/v4l/v4l_calls.c:168 #, c-format msgid "Device \"%s\" does not exist." msgstr "Пристрій \"%s\" не існує." -#: sys/oss/gstosselement.c:750 +#: sys/oss/gstosselement.c:754 #, c-format msgid "Could not open device \"%s\" for writing." msgstr "Не вдається відкрити пристрій \"%s\" для запису." -#: sys/oss/gstosselement.c:754 +#: sys/oss/gstosselement.c:758 #, c-format msgid "Could not open device \"%s\" for reading." msgstr "Не вдається відкрити пристрій \"%s\" для читання." -#: sys/oss/gstosselement.c:1131 +#: sys/oss/gstosselement.c:1135 #, fuzzy msgid "Your OSS device could not be probed correctly" msgstr "Ваш OSS пристрій неможливо коректно перевірити" -- cgit v1.2.1