summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThibaut Mattern <tmattern@users.sourceforge.net>2002-06-19 23:42:50 +0000
committerThibaut Mattern <tmattern@users.sourceforge.net>2002-06-19 23:42:50 +0000
commit10ae339e778a4d5b69ce2ea9b7510bbffc680d32 (patch)
tree3f6d0701a15afcc21514cd85bf29df0eef64f4bb /src
parent8b2e35c76c251339f87e3b77eef375ab4f0a045e (diff)
downloadxine-lib-10ae339e778a4d5b69ce2ea9b7510bbffc680d32.tar.gz
xine-lib-10ae339e778a4d5b69ce2ea9b7510bbffc680d32.tar.bz2
Handle the new flag BUF_FLAG_SEEK.
CVS patchset: 2099 CVS date: 2002/06/19 23:42:50
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/audio_decoder.c8
-rw-r--r--src/xine-engine/video_decoder.c12
2 files changed, 14 insertions, 6 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 019b3f786..f52adc86d 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.77 2002/06/10 13:41:55 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.78 2002/06/19 23:43:43 tmattern Exp $
*
*
* functions that implement audio decoding
@@ -144,7 +144,11 @@ void *audio_decoder_loop (void *this_gen) {
break;
case BUF_CONTROL_NEWPTS:
- this->metronom->handle_audio_discontinuity (this->metronom, DISC_ABSOLUTE, buf->disc_off);
+ if (buf->decoder_flags && BUF_FLAG_SEEK) {
+ this->metronom->handle_audio_discontinuity (this->metronom, DISC_STREAMSEEK, buf->disc_off);
+ } else {
+ this->metronom->handle_audio_discontinuity (this->metronom, DISC_ABSOLUTE, buf->disc_off);
+ }
break;
case BUF_CONTROL_AUDIO_CHANNEL:
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 54d1cf75a..f516ec02e 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_decoder.c,v 1.89 2002/06/10 13:41:55 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.90 2002/06/19 23:42:50 tmattern Exp $
*
*/
@@ -212,11 +212,15 @@ void *video_decoder_loop (void *this_gen) {
this->video_in_discontinuity = 1;
- this->metronom->handle_video_discontinuity (this->metronom, DISC_ABSOLUTE, buf->disc_off);
-
+ if (buf->decoder_flags && BUF_FLAG_SEEK) {
+ this->metronom->handle_video_discontinuity (this->metronom, DISC_STREAMSEEK, buf->disc_off);
+ } else {
+ this->metronom->handle_video_discontinuity (this->metronom, DISC_ABSOLUTE, buf->disc_off);
+ }
+
this->video_in_discontinuity = 0;
break;
-
+
case BUF_CONTROL_AUDIO_CHANNEL:
{
xine_ui_event_t ui_event;