summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-13 19:04:27 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-13 19:04:27 +0000
commit00f00a374a2989944e8030f6303ab4d677dff3eb (patch)
treefd5d6d39bef31d13c2ede33139289ee24a169876
parent3912695d610d41359778384177a0bae14dc00b7c (diff)
downloadxine-lib-00f00a374a2989944e8030f6303ab4d677dff3eb.tar.gz
xine-lib-00f00a374a2989944e8030f6303ab4d677dff3eb.tar.bz2
use xine_read_abort
CVS patchset: 4605 CVS date: 2003/04/13 19:04:27
-rw-r--r--src/input/input_rtsp.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index e4c3e4706..617427607 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -62,7 +62,9 @@ typedef struct {
typedef struct {
input_plugin_t input_plugin;
- rtsp_session_t *rtsp;
+ rtsp_session_t *rtsp;
+
+ xine_stream_t *stream;
char *mrl;
char *public_mrl;
@@ -124,8 +126,10 @@ static off_t rtsp_plugin_seek (input_plugin_t *this_gen, off_t offset, int origi
rtsp_input_plugin_t *this = (rtsp_input_plugin_t *) this_gen;
+#ifdef LOG
printf ("input_rtsp: seek %lld bytes, origin %d\n",
offset, origin);
+#endif
/* only realtive forward-seeking is implemented */
@@ -221,7 +225,7 @@ static int rtsp_plugin_open (input_plugin_t *this_gen) {
printf ("input_rtsp: trying to open '%s'\n", mrl);
#endif
- rtsp = rtsp_session_start(this->mrl);
+ rtsp = rtsp_session_start(this->stream,this->mrl);
if (!rtsp) {
#ifdef LOG
@@ -249,6 +253,7 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str
this = (rtsp_input_plugin_t *) xine_xmalloc (sizeof (rtsp_input_plugin_t));
+ this->stream = stream;
this->rtsp = NULL;
this->mrl = mrl;
/* since we handle only real streams yet, we can savely add