Commit graph

4262 commits

Author SHA1 Message Date
David Schleef
cf56f6b30c gst/gstbuffer.c: (gst_buffer_join): Add function gst_buffer_join() to eventually deprecate gst_buffer_merge(). (bug...
Original commit message from CVS:
* gst/gstbuffer.c: (gst_buffer_join):  Add function gst_buffer_join()
to eventually deprecate gst_buffer_merge().  (bug: #136408)
* gst/gstbuffer.h:
2004-04-01 00:40:26 +00:00
David Schleef
e6a6307944 gst/gstvalue.c: Add some union implementations. We didn't have any previously.
Original commit message from CVS:
* gst/gstvalue.c: (gst_value_union_int_int_range),
(gst_value_union_int_range_int_range), (gst_value_can_union),
(gst_value_union), (_gst_value_initialize):  Add some union
implementations.  We didn't have any previously.
* testsuite/caps/Makefile.am:
* testsuite/caps/audioscale.c: (gst_audioscale_expand_value),
(gst_audioscale_getcaps), (test_caps), (main): A little test
that is the same as the caps manipulation in audioscale.
2004-03-31 21:49:19 +00:00
David Schleef
e38802a565 random changes
Original commit message from CVS:
random changes
2004-03-31 05:57:35 +00:00
Benjamin Otte
8e41905cad docs/faq/general.xml: add entry about "does gst support format X?"
Original commit message from CVS:
* docs/faq/general.xml:
add entry about "does gst support format X?"
2004-03-30 19:50:20 +00:00
Benjamin Otte
3bed253042 gst/gstthread.c: fix docs
Original commit message from CVS:
* gst/gstthread.c:
fix docs
* gst/gstutils.h:
fix GST_BOILERPLATE_FULL to not throw casting errors on C++
2004-03-30 18:02:38 +00:00
Benjamin Otte
6d87ece93d gst/elements/gstbufferstore.c: set the offset of the buffer to the requested offset
Original commit message from CVS:
* gst/elements/gstbufferstore.c: (gst_buffer_store_get_buffer):
set the offset of the buffer to the requested offset
* gst/elements/gsttypefind.c: (stop_typefinding):
revert patch 1.18 (which I unfortunately don't know the reason for).
This is needed to allow downstream elements to seek. Otherwise
typefind might overwrite a previous seek by downstream elements.
This lead to errors with id3tag and typefind on some mp3s.
* gst/schedulers/entryscheduler.c: (COTHREADS_TYPE),
(gst_entry_scheduler_iterate):
be more verbose when debugging
2004-03-30 16:31:06 +00:00
Thomas Vander Stichele
161bcaee42 check string for nullity
Original commit message from CVS:
check string for nullity
2004-03-30 11:21:40 +00:00
Thomas Vander Stichele
0a602d04e0 more doc fixes
Original commit message from CVS:
more doc fixes
2004-03-30 09:15:47 +00:00
David Schleef
8ce063f780 docs/gst/Makefile.am: Disable a bunch of headers from being scanned
Original commit message from CVS:
* docs/gst/Makefile.am:  Disable a bunch of headers from being scanned
* docs/gst/gstreamer-docs.sgml:  More hacking
* docs/gst/gstreamer-sections.txt:
* docs/gst/tmpl/cothreads_compat.sgml:
* docs/gst/tmpl/gstcaps.sgml:
* docs/gst/tmpl/gstclock.sgml:
* docs/gst/tmpl/gstelement.sgml:
* docs/gst/tmpl/gstevent.sgml:
* docs/gst/tmpl/gstpad.sgml:
* docs/gst/tmpl/gstutils.sgml:
* docs/gst/tmpl/gstxml.sgml:
* docs/gst/tmpl/gthread-cothreads.sgml:
* docs/random/ds/0.9-suggested-changes:
* gst/elements/gstfakesink.h: doc fixes
* gst/elements/gstfakesrc.h: doc fixes
* gst/gstcaps.c: doc fixes
* gst/gstcaps.h: doc fixes
* gst/gstelement.c: doc fixes
* gst/gstelement.h: doc fixes
* gst/gstindex.c: doc fixes
* gst/gstinfo.c: doc fixes
* gst/gstpad.c: doc fixes
* gst/gstpad.h: doc fixes
* gst/gstplugin.c: doc fixes
* gst/gsttypefind.h: doc fixes
* gst/gsturi.c: doc fixes
* gst/gstvalue.c: doc fixes
2004-03-30 07:36:19 +00:00
Colin Walters
f8d4198b95 gst/registries/gstxmlregistry.c (get_time)
Original commit message from CVS:
2004-03-29  Colin Walters  <walters@redhat.com>

* gst/registries/gstxmlregistry.c (get_time)
(plugin_times_older_than_recurse):
Use the result of stat to determine whether a path is a file,
so we don't attempt to opendir() files.
2004-03-29 22:17:28 +00:00
Benjamin Otte
097dc18c80 gst/gstpad.c: print caps in debugging output when setting caps failed
Original commit message from CVS:
* gst/gstpad.c: (gst_pad_set_explicit_caps):
print caps in debugging output when setting caps failed
* gst/schedulers/entryscheduler.c: (COTHREADS_TYPE),
(schedule_next_element), (get_buffer), (run_chainhandler),
(element_may_start), (gst_entry_scheduler_chain_handler),
(gst_entry_scheduler_get_handler),
(gst_entry_scheduler_state_transition),
(gst_entry_scheduler_pad_link):
make this scheduler a testcase for mandatory
discont-before-first-buffer which is needed if we want to allow apps
to release the sound device.
add SCHED_ASSERT macro to print scheduler state before an assertion
triggers.
2004-03-29 16:20:45 +00:00
Benjamin Otte
e88256ec74 COPYING: replace by LGPL (former COPYING.LIB). The core is completely licensed LGPL.
Original commit message from CVS:
* COPYING:
replace by LGPL (former COPYING.LIB). The core is completely
licensed LGPL.
* COPYING.LIB:
remove
2004-03-29 13:32:32 +00:00
Thomas Vander Stichele
a64afaa8f5 updated afrikaans and swedish
Original commit message from CVS:
updated afrikaans and swedish
2004-03-29 08:51:29 +00:00
Thomas Vander Stichele
abb174299c adding azerbeidjan
Original commit message from CVS:
adding azerbeidjan
2004-03-29 08:43:07 +00:00
Martin Soto
78640b89c0 gst/gstelement.*: New function for setting element time taking into account a hardware buffering delay.
Original commit message from CVS:
* gst/gstelement.h:
* gst/gstelement.c (gst_element_set_time_delay): New function for
setting element time taking into account a hardware buffering
delay.
(gst_element_set_time): Now just an invocation of
gst_element_set_time_delay.
* gst/gstclock.h:
* gst/gstclock.c (gst_clock_get_event_time_delay): New function
allowing to set event times in the future.
(gst_clock_get_event_time): Now just an invocation of
gst_clock_get_event_time_delay.
2004-03-28 13:15:21 +00:00
Benjamin Otte
b2067f5593 more brown paperbags, i can really start to go shopping soon
Original commit message from CVS:
more brown paperbags, i can really start to go shopping soon
2004-03-28 02:39:59 +00:00
Benjamin Otte
e93d031caa brown paperbag
Original commit message from CVS:
brown paperbag
2004-03-28 02:37:52 +00:00
Benjamin Otte
c29e35436f gst/gstbin.c: don't add decoupled elements to schedulers - otherwise it's impossible to control if a link to a decoup...
Original commit message from CVS:
* gst/gstbin.c: (gst_bin_set_element_sched),
(gst_bin_unset_element_sched):
don't add decoupled elements to schedulers - otherwise it's
impossible to control if a link to a decoupled element was already
removed from a scheduler or not.
* gst/schedulers/cothreads_compat.h:
* gst/schedulers/gthread-cothreads.h:
add COTHREADS_TYPE macro. Make do_cothread_set_func a macro so there
is no "unused" warning.
* gst/schedulers/Makefile.am:
* gst/schedulers/entryscheduler.c:
add new scheduler, based on ideas from talking to David and Martin.
It's supposed to be small and correct. Currently it's also slow (but
it's not noticable)
* examples/retag/retag.c: (main):
* testsuite/bytestream/test1.c: (main):
fix missing NULLs at end of variadic functions
* testsuite/elements/.cvsignore:
update
2004-03-28 02:29:24 +00:00
Jan Schmidt
734bd34a92 Added GST_EVENT_ANY as an event type that passes a GstStructure
Original commit message from CVS:
Added GST_EVENT_ANY as an event type that passes a GstStructure
2004-03-27 15:30:41 +00:00
Christian Schaller
6013f7f244 make this compatible with thomasvs rpms
Original commit message from CVS:
make this compatible with thomasvs rpms
2004-03-27 09:55:53 +00:00
David Schleef
209c82ee06 docs/gst/gstreamer-sections.txt: More doc hacking.
Original commit message from CVS:
* docs/gst/gstreamer-sections.txt:  More doc hacking.
* docs/gst/tmpl/gstaggregator.sgml:
* docs/gst/tmpl/gstautoplugfactory.sgml:
* docs/gst/tmpl/gstbin.sgml:
* docs/gst/tmpl/gstbuffer.sgml:
* docs/gst/tmpl/gstbufferstore.sgml:
* docs/gst/tmpl/gstfakesink.sgml:
* docs/gst/tmpl/gstfakesrc.sgml:
* docs/gst/tmpl/gstmd5sink.sgml:
* docs/gst/tmpl/gstreamer-unused.sgml:
* docs/gst/tmpl/gstsearchfuncs.sgml:
* docs/gst/tmpl/gstshaper.sgml:
* docs/gst/tmpl/gstspider.sgml:
* docs/gst/tmpl/gsttee.sgml:
* docs/gst/tmpl/gstutils.sgml:
* docs/gst/tmpl/gstvalue.sgml:
* docs/gst/tmpl/gstxml.sgml:
* gst/Makefile.am:  Remove gstthreaddummy.c.  It never worked,
and we don't support it.
* gst/gst.c: (gst_init_get_popt_table), (init_pre), (init_post),
(gst_use_threads), (gst_has_threads): same
* gst/gstthreaddummy.c: same
* gst/autoplug/gstspider.c: Make gst_spider_details static.
* gst/autoplug/gstspider.h: same
* gst/elements/gstaggregator.h: Remove bogus function from header
* gst/elements/gstfakesink.h: same
* gst/elements/gstfakesrc.h: same
* gst/elements/gstmd5sink.h: same
* gst/elements/gstshaper.h: same
* gst/elements/gsttee.h: same
* gst/gstbin.c: doc fixes
* gst/gstbin.h: Remove unused definition.
* gst/gstbuffer.c: doc fixes
* gst/gstcaps.c: (gst_caps_is_always_compatible): doc fixes
* gst/gstfilter.c: doc fixes
* gst/gsttag.c: doc fixes
* gst/gstvalue.c: doc fixes
2004-03-26 03:46:16 +00:00
Ronald S. Bultje
4d9b9b989e docs/pwg/advanced-types.xml: Document typefinding.
Original commit message from CVS:
* docs/pwg/advanced-types.xml:
Document typefinding.
* docs/pwg/other-oneton.xml:
Document one-to-n elements, demuxers and parsers.
2004-03-26 01:53:06 +00:00
David Schleef
5710f325b3 configure.ac: Check bison version (bug #127838)
Original commit message from CVS:
reviewed by: David Schleef  <ds@schleef.org>
* configure.ac: Check bison version (bug #127838)
2004-03-25 22:19:19 +00:00
David Schleef
e2e72a8993 docs/gst/gstreamer-docs.sgml: More fine tuning.
Original commit message from CVS:
* docs/gst/gstreamer-docs.sgml: More fine tuning.
* docs/gst/gstreamer-sections.txt:
* docs/gst/tmpl/gstautoplug.sgml:
* docs/gst/tmpl/gststaticautoplug.sgml:
* docs/gst/tmpl/gststaticautoplugrender.sgml:
* docs/gst/tmpl/gstutils.sgml:
* docs/gst/tmpl/gstxml.sgml:
2004-03-25 19:26:26 +00:00
David Schleef
1e4ad29e52 docs/gst/gstreamer-docs.sgml: I got tired of the reference manual being such complete crap, that I decided to do majo...
Original commit message from CVS:
* docs/gst/gstreamer-docs.sgml:  I got tired of the reference
manual being such complete crap, that I decided to do major
hacking of it.  This checkin replaces any fine tuning that
may have been done previously, with the benefit of actually
being complete for much of the API that was changed since
0.6.  Further fine tuning will occur shortly.  (bug #134721)
* docs/gst/gstreamer-sections.txt:
* docs/gst/tmpl/GstBin.sgml:
* docs/gst/tmpl/GstBuffer.sgml:
* docs/gst/tmpl/GstCaps.sgml:
* docs/gst/tmpl/GstClock.sgml:
* docs/gst/tmpl/GstCompat.sgml:
* docs/gst/tmpl/GstData.sgml:
* docs/gst/tmpl/GstElement.sgml:
* docs/gst/tmpl/GstEvent.sgml:
* docs/gst/tmpl/GstIndex.sgml:
* docs/gst/tmpl/GstStructure.sgml:
* docs/gst/tmpl/GstTag.sgml:
* docs/gst/tmpl/cothreads.sgml:
* docs/gst/tmpl/cothreads_compat.sgml:
* docs/gst/tmpl/gettext.sgml:
* docs/gst/tmpl/grammar.tab.sgml:
* docs/gst/tmpl/gst-i18n-app.sgml:
* docs/gst/tmpl/gst-i18n-lib.sgml:
* docs/gst/tmpl/gst.sgml:
* docs/gst/tmpl/gst_private.sgml:
* docs/gst/tmpl/gstaggregator.sgml:
* docs/gst/tmpl/gstarch.sgml:
* docs/gst/tmpl/gstatomic.sgml:
* docs/gst/tmpl/gstatomic_impl.sgml:
* docs/gst/tmpl/gstbin.sgml:
* docs/gst/tmpl/gstbuffer.sgml:
* docs/gst/tmpl/gstbufferstore.sgml:
* docs/gst/tmpl/gstcaps.sgml:
* docs/gst/tmpl/gstclock.sgml:
* docs/gst/tmpl/gstcompat.sgml:
* docs/gst/tmpl/gstconfig.sgml:
* docs/gst/tmpl/gstcpu.sgml:
* docs/gst/tmpl/gstdata.sgml:
* docs/gst/tmpl/gstdata_private.sgml:
* docs/gst/tmpl/gstelement.sgml:
* docs/gst/tmpl/gstenumtypes.sgml:
* docs/gst/tmpl/gsterror.sgml:
* docs/gst/tmpl/gstevent.sgml:
* docs/gst/tmpl/gstfakesink.sgml:
* docs/gst/tmpl/gstfakesrc.sgml:
* docs/gst/tmpl/gstfilesink.sgml:
* docs/gst/tmpl/gstfilter.sgml:
* docs/gst/tmpl/gstindex.sgml:
* docs/gst/tmpl/gstinfo.sgml:
* docs/gst/tmpl/gstinterface.sgml:
* docs/gst/tmpl/gstlog.sgml:
* docs/gst/tmpl/gstmacros.sgml:
* docs/gst/tmpl/gstmarshal.sgml:
* docs/gst/tmpl/gstmd5sink.sgml:
* docs/gst/tmpl/gstmultifilesrc.sgml:
* docs/gst/tmpl/gstobject.sgml:
* docs/gst/tmpl/gstpad.sgml:
* docs/gst/tmpl/gstparse.sgml:
* docs/gst/tmpl/gstpipeline.sgml:
* docs/gst/tmpl/gstplugin.sgml:
* docs/gst/tmpl/gstpluginfeature.sgml:
* docs/gst/tmpl/gstqueue.sgml:
* docs/gst/tmpl/gstreamer-unused.sgml:
* docs/gst/tmpl/gstregistry.sgml:
* docs/gst/tmpl/gstregistrypool.sgml:
* docs/gst/tmpl/gstscheduler.sgml:
* docs/gst/tmpl/gstsearchfuncs.sgml:
* docs/gst/tmpl/gstshaper.sgml:
* docs/gst/tmpl/gstspider.sgml:
* docs/gst/tmpl/gstspideridentity.sgml:
* docs/gst/tmpl/gststructure.sgml:
* docs/gst/tmpl/gstsystemclock.sgml:
* docs/gst/tmpl/gsttag.sgml:
* docs/gst/tmpl/gsttaginterface.sgml:
* docs/gst/tmpl/gsttee.sgml:
* docs/gst/tmpl/gstthread.sgml:
* docs/gst/tmpl/gsttrace.sgml:
* docs/gst/tmpl/gsttrashstack.sgml:
* docs/gst/tmpl/gsttypefind.sgml:
* docs/gst/tmpl/gsttypes.sgml:
* docs/gst/tmpl/gsturi.sgml:
* docs/gst/tmpl/gsturitype.sgml:
* docs/gst/tmpl/gstutils.sgml:
* docs/gst/tmpl/gstvalue.sgml:
* docs/gst/tmpl/gstversion.sgml:
* docs/gst/tmpl/gstxml.sgml:
* docs/gst/tmpl/gstxmlregistry.sgml:
* docs/gst/tmpl/gthread-cothreads.sgml:
* docs/gst/tmpl/types.sgml:
2004-03-25 04:20:33 +00:00
Ronald S. Bultje
b988d58ab2 docs/pwg/: Documentation on how to write source and sink elements. Other stuff in chapter 4 (1-to-n/demuxer, n-to-1/m...
Original commit message from CVS:
* docs/pwg/other-sink.xml:
* docs/pwg/other-source.xml:
Documentation on how to write source and sink elements. Other
stuff in chapter 4 (1-to-n/demuxer, n-to-1/muxer, n-to-n,
manager, autoplugger) are all still pending.
2004-03-25 03:11:57 +00:00
Benjamin Otte
d357e5c959 no dear, that dress doesn't make you look fat. You look fat even without it.
Original commit message from CVS:
no dear, that dress doesn't make you look fat. You look fat even without it.
2004-03-25 02:43:28 +00:00
Benjamin Otte
4c0c9065f2 yes, dear, i'll leave the shoes at the front door
Original commit message from CVS:
yes, dear, i'll leave the shoes at the front door
2004-03-25 02:17:40 +00:00
Benjamin Otte
eb27a12ade i'd probably prefer a bitchy wife to automake
Original commit message from CVS:
i'd probably prefer a bitchy wife to automake
2004-03-25 02:05:22 +00:00
Benjamin Otte
dd092ad092 pleasing automake more
Original commit message from CVS:
pleasing automake more
2004-03-25 01:55:31 +00:00
Benjamin Otte
b8a69a8471 whoops, forgot to clean Makefile
Original commit message from CVS:
whoops, forgot to clean Makefile
2004-03-25 01:53:17 +00:00
Benjamin Otte
9b15382196 fix Makefile for buildbots
Original commit message from CVS:
fix Makefile for buildbots
2004-03-25 01:32:26 +00:00
Benjamin Otte
3f812f873f testsuite/elements/: add check to make sure gst-compprep works
Original commit message from CVS:
* testsuite/elements/Makefile.am:
* testsuite/elements/gst-compprep-check:
add check to make sure gst-compprep works
* testsuite/elements/gst-inspect-check.in:
improve initialization output
* testsuite/gst-inspect-check:
remove old file
2004-03-25 00:32:19 +00:00
David Schleef
2d19f03ddb testsuite/elements/: Add gst-inspect-check to the testsuite.
Original commit message from CVS:
* testsuite/elements/Makefile.am:
* testsuite/elements/gst-inspect-check.in: Add gst-inspect-check
to the testsuite.
2004-03-24 23:48:24 +00:00
Benjamin Otte
da1c2f8f2a libs/gst/control/: fix lvalue casts for real
Original commit message from CVS:
* libs/gst/control/dparam.c: (gst_dparam_attach),
(gst_dparam_detach):
* libs/gst/control/dparammanager.c: (gst_dpman_init):
fix lvalue casts for real
2004-03-24 15:51:27 +00:00
Benjamin Otte
7f6e97ebe9 gst/schedulers/: fix GStreamer to not have issues with lvalue casts anymore (fixes some bug, but bugzilla is down)
Original commit message from CVS:
* gst/schedulers/gstbasicscheduler.c:
(gst_basic_scheduler_src_wrapper):
* gst/schedulers/gstoptimalscheduler.c:
(gst_opt_scheduler_loop_wrapper), (gst_opt_scheduler_get_wrapper),
(pad_clear_queued), (gst_opt_scheduler_add_element),
(gst_opt_scheduler_remove_element):
fix GStreamer to not have issues with lvalue casts anymore (fixes
some bug, but bugzilla is down)
2004-03-24 14:06:48 +00:00
Benjamin Otte
0c01133df9 gst/gstelement.c: add documentation about a gobject quirk where the object hasn't the correct class pointer set on in...
Original commit message from CVS:
* gst/gstelement.c:
add documentation about a gobject quirk where the object hasn't the
correct class pointer set on initialization
* gst/schedulers/gstbasicscheduler.c:
(gst_basic_scheduler_src_wrapper):
make sure to not run into an infinite loop
2004-03-24 13:38:17 +00:00
Benjamin Otte
58a5ccec56 gst/gstutils.*: first argument of gst_util_dump_mem should be const
Original commit message from CVS:
* gst/gstutils.c: (gst_util_dump_mem):
* gst/gstutils.h:
first argument of gst_util_dump_mem should be const
2004-03-22 22:23:50 +00:00
Johan Dahlin
f9f0df62e8 gst/gstvalue.h: Clean up a little bit.
Original commit message from CVS:
* gst/gstvalue.h: Clean up a little bit.
2004-03-22 15:35:06 +00:00
Benjamin Otte
c903ce8a27 gst/: clean up used memory in this elements correctly on teardown (closes #137279)
Original commit message from CVS:
reviewed by Benjamin Otte  <otte@gnome.org>
* gst/autoplug/gstspider.c: (gst_spider_dispose):
* gst/elements/gstaggregator.c: (gst_aggregator_finalize),
(gst_aggregator_class_init), (gst_aggregator_init):
* gst/elements/gstfilesrc.c: (gst_filesrc_init),
(gst_filesrc_dispose), (gst_filesrc_set_location):
* gst/elements/gstidentity.c: (gst_identity_finalize),
(gst_identity_class_init), (gst_identity_chain):
* gst/elements/gstmultifilesrc.c: (gst_multifilesrc_open_file):
* gst/elements/gststatistics.c: (gst_statistics_finalize),
(gst_statistics_class_init):
* gst/elements/gsttee.c: (gst_tee_finalize), (gst_tee_class_init),
(gst_tee_get_property):
clean up used memory in this elements correctly on teardown (closes
#137279)
2004-03-21 03:22:55 +00:00
Colin Walters
5033bd37b9 I'm too lazy to comment this
Original commit message from CVS:
*** empty log message ***
2004-03-20 23:35:59 +00:00
Colin Walters
5dce08af99 gst/registries/gstxmlregistry.c: Make registry saving atomic.
Original commit message from CVS:
2004-03-20  Colin Walters  <walters@verbum.org>

* gst/registries/gstxmlregistry.c:
(gst_xml_registry_open_func, gst_xml_registry_close_func): Make
registry saving atomic.
2004-03-20 20:24:49 +00:00
Colin Walters
59c20484d0 gst/registries/gstxmlregistry.c (gst_xml_registry_get_perms_func): Just use access() instead of actually creating and...
Original commit message from CVS:
2004-03-20  Colin Walters  <walters@verbum.org>

* gst/registries/gstxmlregistry.c (gst_xml_registry_get_perms_func): Just use
access() instead of actually creating and deleting files.
2004-03-20 17:59:08 +00:00
David Schleef
7ba2b5541d configure.ac: Remove HAVE_ATOMIC_H test, since it's unused. (bug #137625)
Original commit message from CVS:
* configure.ac:  Remove HAVE_ATOMIC_H test, since it's unused.
(bug #137625)
2004-03-18 20:24:32 +00:00
Thomas Vander Stichele
d7675cae87 updated swedish translation
Original commit message from CVS:
updated swedish translation
2004-03-18 18:15:17 +00:00
Thomas Vander Stichele
0bf7263c12 updated translation return silently when filesink not open
Original commit message from CVS:
updated translation
return silently when filesink not open
2004-03-18 13:01:21 +00:00
Thomas Vander Stichele
c7c3a5a4d4 dist common properly
Original commit message from CVS:
dist common properly
2004-03-18 12:14:43 +00:00
Thomas Vander Stichele
41239183d7 fix
Original commit message from CVS:
fix
2004-03-17 20:51:05 +00:00
Thomas Vander Stichele
77cacb3fee adding afrikaans and swedish
Original commit message from CVS:
adding afrikaans and swedish
2004-03-17 18:03:17 +00:00
Thomas Vander Stichele
8b28d0d9a6 use release.mak
Original commit message from CVS:
use release.mak
2004-03-17 10:50:04 +00:00