Commit graph

312 commits

Author SHA1 Message Date
Ronald S. Bultje
39caf72eaf ext/ogg/gstoggmux.c: Basic pad template which accepts OGM tracks, speex, flac, vorbis and theora. Any is incorrect.
Original commit message from CVS:
* ext/ogg/gstoggmux.c:
Basic pad template which accepts OGM tracks, speex, flac, vorbis
and theora. Any is incorrect.
* gst/asfdemux/gstasfmux.c: (gst_asfmux_vidsink_link):
Fix caps.
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_base_init):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_base_init),
(gst_v4lmjpegsrc_init), (gst_v4lmjpegsrc_srcconnect),
(gst_v4lmjpegsrc_getcaps), (gst_v4lmjpegsrc_change_state):
* sys/v4l/gstv4lmjpegsrc.h:
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_src_link), (gst_v4lsrc_getcaps),
(gst_v4lsrc_change_state):
* sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_capture_start),
(gst_v4lmjpegsrc_capture_stop):
Fix caps. Keep track of internal state. Work.
2004-10-24 13:41:18 +00:00
Zaheer Abbas Merali
e6da3f8689 sys/v4l/: Change g_warnings to GST_WARNING_OBJECT and fix colourspace issue
Original commit message from CVS:
2004-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps),
(gst_v4lsrc_getcaps), (gst_v4lsrc_get):
* sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
Change g_warnings to GST_WARNING_OBJECT and fix colourspace issue
2004-10-10 17:00:03 +00:00
Zaheer Abbas Merali
1b27bea7ad sys/v4l/gstv4lsrc.c: Fix for webcams that support only specific width or height
Original commit message from CVS:
2004-10-10  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_src_link), (gst_v4lsrc_getcaps):
Fix for webcams that support only specific width or height
2004-10-10 16:35:44 +00:00
Julien Moutte
18fff8755d sys/: Reverting Ronald's changes as the issue is not coming from those elements. Moreover these elements should not k...
Original commit message from CVS:
2004-10-08  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_sink_link),
(gst_ximagesink_set_xwindow_id), (gst_ximagesink_init):
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
(gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init):
* sys/xvimage/xvimagesink.h: Reverting Ronald's changes as the issue is
not coming from those elements. Moreover these elements should not keep
the xid they have been given when in NULL state.
2004-10-08 11:26:49 +00:00
Ronald S. Bultje
b91e99d910 sys/: Actually only create a new toplevel window if we're not gonna embed it right after.
Original commit message from CVS:
* sys/ximage/ximagesink.c: (gst_ximagesink_sink_link),
(gst_ximagesink_set_xwindow_id), (gst_ximagesink_init):
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
(gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init):
* sys/xvimage/xvimagesink.h:
Actually only create a new toplevel window if we're not gonna
embed it right after.
2004-10-07 16:22:30 +00:00
Ronald S. Bultje
c626afd60a sys/v4l/v4lsrc_calls.c: Don't actually error out if we get another return value than
Original commit message from CVS:
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_try_capture):
Don't actually error out if we get another return value than
-EINVAL. Opposite to what I first thought, drivers have random
return values for this, although -EINVAL is the expected return
value. Since this is not fatal, we shouldn't use
GST_ELEMENT_ERROR() but just GST_ERROR_OBJECT().
2004-10-01 10:02:42 +00:00
Julien Moutte
e2f4b668d3 sys/: Fix mistakes from thaytan's patches.
Original commit message from CVS:
2004-09-22  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls): Fix
mistakes from thaytan's patches.
2004-09-22 15:59:56 +00:00
Jan Schmidt
fbfef0cba4 sys/ximage/ximagesink.c: For completeness, XSync in the destroy function as xvimage does.
Original commit message from CVS:
* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
For completeness, XSync in the destroy function as xvimage does.
2004-09-22 15:32:39 +00:00
Jan Schmidt
771b0248e7 ext/gdk_pixbuf/pixbufscale.c: Correct caps negotiation
Original commit message from CVS:
* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps):
Correct caps negotiation
* gst/volume/gstvolume.c: (volume_chain_float),
(volume_chain_int16):
Modify debug output to be little more informative
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_destroy):
Add XSync calls after detaching from the shared memory segment to
avoid a crash.
2004-09-22 15:03:08 +00:00
Ronald S. Bultje
b709c6844b ext/alsa/gstalsamixer.c: Update mixer (to sync with other sessions) if we try to obtain a new value. This makes alsam...
Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_update),
(gst_alsa_mixer_get_volume), (gst_alsa_mixer_set_volume),
(gst_alsa_mixer_set_mute), (gst_alsa_mixer_set_record),
(gst_alsa_mixer_set_option), (gst_alsa_mixer_get_option):
Update mixer (to sync with other sessions) if we try to obtain
a new value. This makes alsamixer work accross applications.
* ext/alsa/gstalsasink.c: (gst_alsa_sink_get_time):
Only call sync functions if we're running, else alsalib asserts.
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_src_query):
Sometimes fails to compile. Possibly a gcc bug.
* gst/playback/gstplaybin.c: (gen_video_element),
(gen_audio_element):
Add a reference to an application-provided object, because we lose
this same reference if we add it to the bin. If we don't do this,
we can only use this object once and thus crash if we go from
ready to playing, back to ready and back to playing again.
Also add an audioscale element because several cheap soundcards -
like mine - don't support all samplerates.
* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get),
(gst_ximagesink_xcontext_clear), (gst_ximagesink_change_state):
Fix wrong order or PAR calls. Makes automatically obtained PAR
from the X server atually being used.
2004-09-13 09:24:00 +00:00
David Schleef
cad19a8d55 Fixes: #151879, #151881, #151882, #151883, #151884, #151886, #151887, #152102, #152247.
Original commit message from CVS:
Fixes: #151879, #151881, #151882, #151883, #151884, #151886,
#151887, #152102, #152247.
* examples/indexing/indexmpeg.c: 64-bit warning fixes.
* examples/seeking/cdparanoia.c: same
* examples/seeking/cdplayer.c: same
* examples/seeking/seek.c: same
* examples/seeking/spider_seek.c: same
* examples/seeking/vorbisfile.c: same
* examples/stats/mp2ogg.c: same
* ext/esd/esdsink.c: (gst_esdsink_class_init),
(gst_esdsink_dispose): Dispose of element properly.
* ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_seek): 64-bit warning
fixes.
* ext/nas/nassink.c: (gst_nassink_class_init),
(gst_nassink_dispose): Dispose of element correctly.
* gst/wavenc/gstwavenc.c: (gst_wavenc_chain): Fix leak.
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new), (gst_ximagesink_ximage_destroy):
Fix 64-bit warning.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_new), (gst_xvimagesink_xvimage_destroy):
Fix 64-bit warning.
2004-09-12 22:57:27 +00:00
Thomas Vander Stichele
28a56927b4 fix for 151236
Original commit message from CVS:
fix for 151236
2004-08-30 10:26:52 +00:00
Johan Dahlin
4bc732a020 sys/v4l/gstv4lelement.c (gst_v4l_iface_supported): Remove bogus checks. Doesn't matter what state we are in. Interfac...
Original commit message from CVS:
* sys/v4l/gstv4lelement.c (gst_v4l_iface_supported): Remove bogus
checks. Doesn't matter what state we are in. Interfaces are a
compile time thing, not runtime. It also broke the python bindings.
2004-08-12 16:39:45 +00:00
Thomas Vander Stichele
df4c4fbead fix fixate and link
Original commit message from CVS:
fix fixate and link
2004-08-12 15:58:52 +00:00
Gernot Ziegler
f7de3bfba5 GL sink plugin. (Bug #147302)
Original commit message from CVS:
Patch from Gernot Ziegler <gz@lysator.liu.se> rewriting the
GL sink plugin.  (Bug #147302)
* configure.ac: Test for OpenGL
* sys/Makefile.am: Use test for OpenGL
* sys/glsink/Makefile.am:
* sys/glsink/glimagesink.c: rewrite
* sys/glsink/glimagesink.h: rewrite
2004-08-09 20:14:50 +00:00
David Schleef
b811682326 ext/sdl/sdlvideosink.c: Only allow sane framerates.
Original commit message from CVS:
* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_base_init):  Only allow
sane framerates.
* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get): same
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support): same
* testsuite/gst-lint: Test for G_GUINT64_FORMAT usage near gettext.
2004-08-09 20:07:10 +00:00
Thomas Vander Stichele
6a51c30e73 assign error codes
Original commit message from CVS:
assign error codes
2004-08-09 09:00:05 +00:00
Benjamin Otte
1786973790 compile fixes for --disable-gst-debug, G_DISABLE_ASSERT and friends
Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume),
(gst_alsa_mixer_set_volume), (gst_alsa_mixer_set_mute),
(gst_alsa_mixer_set_record), (gst_alsa_mixer_set_option),
(gst_alsa_mixer_get_option):
* ext/dvdnav/dvdnavsrc.c: (dvdnav_get_event_name),
(dvdnavsrc_print_event):
* ext/ogg/gstoggdemux.c: (_find_chain_process), (gst_ogg_print):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_pad_link),
(gst_ogg_mux_pad_unlink):
* gst/multipart/multipartmux.c: (gst_multipart_mux_pad_link),
(gst_multipart_mux_pad_unlink):
* gst/videofilter/gstvideobalance.c:
(gst_videobalance_colorbalance_set_value):
* gst/videomixer/videomixer.c: (gst_videomixer_pad_link),
(gst_videomixer_pad_unlink):
* po/uk.po:
* sys/oss/gstossmixer.c:
* sys/v4l/gstv4lcolorbalance.c:
* sys/v4l/gstv4ltuner.c:
* sys/v4l/v4lsrc_calls.c:
* sys/v4l2/gstv4l2colorbalance.c:
* sys/v4l2/gstv4l2tuner.c:
compile fixes for --disable-gst-debug, G_DISABLE_ASSERT and friends
2004-08-03 16:06:08 +00:00
Jan Schmidt
07ea0aef1c Use gdouble when calculating pixel-aspect-ratio
Original commit message from CVS:
Use gdouble when calculating pixel-aspect-ratio
2004-08-03 14:09:26 +00:00
Thomas Vander Stichele
0fefd341a7 add debugging for display PAR calculation
Original commit message from CVS:
add debugging for display PAR calculation
2004-08-03 08:48:29 +00:00
Thomas Vander Stichele
89f9b482c8 sync xvimagesink with ximagesink
Original commit message from CVS:
sync xvimagesink with ximagesink
2004-08-02 10:04:08 +00:00
Thomas Vander Stichele
8330cdfbad use autodetected PAR if none specified. add directfb workaround.
Original commit message from CVS:
use autodetected PAR if none specified. add directfb workaround.
2004-07-28 21:28:34 +00:00
Thomas Vander Stichele
cc2e1fab44 pixel aspect ratio handling
Original commit message from CVS:
pixel aspect ratio handling
2004-07-27 16:43:24 +00:00
Thomas Vander Stichele
57d0160a5f further cleanups, fixes, logging and error handling
Original commit message from CVS:
further cleanups, fixes, logging and error handling
2004-07-27 10:27:53 +00:00
Julien Moutte
23f23004c5 sys/xvimage/xvimagesink.c: Some fixes to image size calculation.
Original commit message from CVS:
2004-07-27  Julien MOUTTE  <julien@moutte.net>

* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_new): Some fixes to image size calculation.
2004-07-27 10:10:02 +00:00
Julien Moutte
a62f5d27cf sys/: When the atom is not available we have to unlock the mutex. Fixes #148023
Original commit message from CVS:
2004-07-27  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_decorate):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xwindow_decorate): When
the atom is not available we have to unlock the mutex. Fixes #148023
2004-07-27 09:35:52 +00:00
Julien Moutte
745e6365b0 sys/ximage/ximagesink.c: Some more fixes to image size calculation.
Original commit message from CVS:
2004-07-26  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new): Some more fixes to image size calculation.
2004-07-26 21:07:33 +00:00
Thomas Vander Stichele
a7f894f833 break line
Original commit message from CVS:
break line
2004-07-26 13:04:32 +00:00
Thomas Vander Stichele
a79c5196c8 add debugging, use correct size for shm segments
Original commit message from CVS:
add debugging, use correct size for shm segments
2004-07-26 13:00:27 +00:00
Julien Moutte
a9aec497a5 sys/ximage/ximagesink.c: Optimize images creation for both elements. We don't create the image on caps nego or renego...
Original commit message from CVS:
2004-07-21  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_new),
(gst_ximagesink_renegotiate_size), (gst_ximagesink_sink_link),
(gst_ximagesink_chain), (gst_ximagesink_set_xwindow_id): Optimize
images creation for both elements. We don't create the image on caps
nego or renego, we just destroy the internal one if present if it does
not match the needs. The chain function takes care of creating a new
image when needed.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_new),
(gst_xvimagesink_xwindow_decorate), (gst_xvimagesink_sink_link),
(gst_xvimagesink_chain), (gst_xvimagesink_buffer_alloc),
(gst_xvimagesink_set_xwindow_id): Additionally xvimage now contains
the image format information. The buffer pool checks for the context
image format and discard images with different formats.
* sys/xvimage/xvimagesink.h: Adding im_format in the xvimage structure.
2004-07-21 11:02:32 +00:00
David Schleef
02ef2b6e5f sys/ximage/ximagesink.c: Don't use an Atom that doesn't exist.
Original commit message from CVS:
* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_decorate):
Don't use an Atom that doesn't exist.
2004-07-20 19:15:41 +00:00
Thomas Vander Stichele
1a6f6848e9 respect SYNCHRONOUS after getting X context
Original commit message from CVS:
respect SYNCHRONOUS after getting X context
2004-07-19 11:33:32 +00:00
Thomas Vander Stichele
4c536aef8c whitespace and style cleanup
Original commit message from CVS:
whitespace and style cleanup
2004-07-19 11:21:10 +00:00
Julien Moutte
b10414dfb4 sys/: Getting the 2 video sinks synchronized again. Using internal data pointer of the x(v)image to store image's dat...
Original commit message from CVS:
2004-07-16  Julien MOUTTE  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xerror),
(gst_ximagesink_check_xshm_calls), (gst_ximagesink_ximage_new),
(gst_ximagesink_ximage_destroy), (gst_ximagesink_sink_link),
(gst_ximagesink_chain), (gst_ximagesink_buffer_free),
(gst_ximagesink_buffer_alloc):
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_new), (gst_xvimagesink_xvimage_destroy),
(gst_xvimagesink_chain), (gst_xvimagesink_buffer_free),
(gst_xvimagesink_buffer_alloc):
* sys/xvimage/xvimagesink.h: Getting the 2 video sinks synchronized
again. Using internal data pointer of the x(v)image to store image's
data to be coherent with the buffer alloc mechanism. Investigated the
image destruction code to be sure that everything gets freed correctly.
2004-07-16 10:48:52 +00:00
Wim Taymans
6280b05906 sys/: FPS seems to be 0.0 to MAX everywhere else.
Original commit message from CVS:
* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support):
FPS seems to be 0.0 to MAX everywhere else.
2004-07-16 10:33:27 +00:00
Tim Ringenbach
5acca27963 sys/xvimage/xvimagesink.c:
Original commit message from CVS:
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_new), (gst_xvimagesink_xvimage_destroy):
fix for non-shm xv. Original patch by Tim Ringenbach (fixes #147248)
2004-07-15 21:18:11 +00:00
Benjamin Otte
823eddd738 sys/oss/: advertise correct template caps - we indeed do non-native endianness and 8bit audio has no endianness
Original commit message from CVS:
* sys/oss/gstosssink.c:
* sys/oss/gstosssrc.c:
advertise correct template caps - we indeed do non-native endianness
and 8bit audio has no endianness
* sys/ximage/ximagesink.c: (gst_ximagesink_getcaps):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_getcaps):
avoid (wrong) duplications in getcaps function and return
template caps
2004-06-29 11:20:25 +00:00
Julien Moutte
2624d3ea37 sys/: I prefer locking the mutex in the function directly. We might want to call it from somewhere else one day.
Original commit message from CVS:
2004-06-27  Julien Moutte  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_decorate),
(gst_ximagesink_xwindow_new):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xwindow_decorate),
(gst_xvimagesink_xwindow_new): I prefer locking the mutex in the
function directly. We might want to call it from somewhere else one day.
2004-06-27 19:02:29 +00:00
Julien Moutte
fa3c245918 sys/: Trying to fix the random behaviour of window decorations.
Original commit message from CVS:
2004-06-27  Julien Moutte  <julien@moutte.net>

* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_decorate),
(gst_ximagesink_xwindow_new):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xwindow_decorate),
(gst_xvimagesink_xwindow_new): Trying to fix the random behaviour of
window decorations.
2004-06-27 18:53:04 +00:00
Thomas Vander Stichele
a45f29c44a fix videorate decision, add latency offset to v4l
Original commit message from CVS:
fix videorate decision, add latency offset to v4l
2004-06-26 15:58:35 +00:00
Zaheer Abbas Merali
ee158654d5 configure.ac: Add objective-c support if running in Darwin/Mac OS X
Original commit message from CVS:
2004-06-22  Zaheer Abbas Merali  <zaheerabbas at merali.org>

* configure.ac:
Add objective-c support if running in Darwin/Mac OS X
* sys/Makefile.am:
* sys/osxvideo:
* sys/osxvideo/Makefile.am:
* sys/osxvideo/osxvideosink.h:
* sys/osxvideo/osxvideosink.m:
* sys/osxvideo/cocoawindow.h:
* sys/osxvideo/cocoawindow.m:
Add osxvideosink, a cocoa-based osx video sink
2004-06-22 00:21:51 +00:00
Thomas Vander Stichele
aabfd87d93 read caps in connect
Original commit message from CVS:
read caps in connect
2004-06-17 18:20:43 +00:00
Thomas Vander Stichele
1cce622d6e jesus firetrucking christ
Original commit message from CVS:
jesus firetrucking christ
2004-06-17 17:43:18 +00:00
Thomas Vander Stichele
b72439823e add autoprobe option fixes use try_capture
Original commit message from CVS:
add autoprobe option
fixes
use try_capture
2004-06-17 17:06:24 +00:00
Thomas Vander Stichele
718f2ddec0 run as finalize, not dispose
Original commit message from CVS:
run as finalize, not dispose
2004-06-17 14:15:23 +00:00
Wim Taymans
ae8739f761 sys/v4l/: Added a copy mode to v4lsrc where it will output a copied version of its internal hardware buffer.
Original commit message from CVS:
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get):
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_sync_mode_get_type),
(gst_v4lsrc_class_init), (gst_v4lsrc_init), (gst_v4lsrc_get_fps),
(gst_v4lsrc_get), (gst_v4lsrc_set_property),
(gst_v4lsrc_get_property):
* sys/v4l/gstv4lsrc.h:
Added a copy mode to v4lsrc where it will output a copied version
of its internal hardware buffer.
Fix the wrong FLAG_SET usage. The flags are integers, not bits, you
can't | them.
2004-06-16 15:07:58 +00:00
Wim Taymans
bb64d50ef8 sys/v4l/: Added a sync mode enum property to control v4lsrc timestamp method
Original commit message from CVS:
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_sync_mode_get_type),
(gst_v4lsrc_class_init), (gst_v4lsrc_init), (gst_v4lsrc_get_fps),
(gst_v4lsrc_get), (gst_v4lsrc_set_property),
(gst_v4lsrc_get_property):
* sys/v4l/gstv4lsrc.h:
* sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
Added a sync mode enum property to control v4lsrc timestamp method
Removed the use-fixed-fps property and moved functionality in
the enum.
Don't error on an error value from v4l-conf, it might not always
be a real error.
2004-06-16 10:13:51 +00:00
Thomas Vander Stichele
5e9b6aab3b paranoia cleanups and a sync fix
Original commit message from CVS:
paranoia cleanups and a sync fix
2004-06-15 09:11:06 +00:00
Thomas Vander Stichele
f8044583c0 negotiating webcam framerate now works
Original commit message from CVS:
negotiating webcam framerate now works
2004-06-09 11:32:39 +00:00
Thomas Vander Stichele
765f8c50ba changing debug stuff
Original commit message from CVS:
changing debug stuff
2004-06-08 16:45:19 +00:00