summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2011-03-24 09:57:44 +0000
committerphintuka <phintuka>2011-03-24 09:57:44 +0000
commitfc39700ac035ac6212d9107ae0bc5dfe535a1de8 (patch)
treee67a22525db52788997e05f97f7d6fabdd7f32c6
parent58ee1b978a44c4deeefc360fc747b51c2e420c6e (diff)
downloadxineliboutput-fc39700ac035ac6212d9107ae0bc5dfe535a1de8.tar.gz
xineliboutput-fc39700ac035ac6212d9107ae0bc5dfe535a1de8.tar.bz2
Do not select RTP automatically.
It causes problems with most wireless networks.
-rw-r--r--README4
-rw-r--r--xine_input_vdr.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/README b/README
index 4d3139a5..aa89819d 100644
--- a/README
+++ b/README
@@ -159,10 +159,12 @@ Using remote frontends
find server (or specific transport should be used), mrl must
be given on command line.
+ NOTE: RTP is used only when requested with rtp: mrl or --rtp command-line option.
+
Examples:
Search for VDR (xineliboutput) server, connect to it and
- negotiate best available transport. Use best available audio
+ negotiate best available transport. Use best available audio
and video driver.
vdr-fbfe
or
diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index bd9cc27e..5e133bd1 100644
--- a/xine_input_vdr.c
+++ b/xine_input_vdr.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_input_vdr.c,v 1.334 2011-03-24 09:53:03 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.335 2011-03-24 09:57:44 phintuka Exp $
*
*/
@@ -136,7 +136,7 @@ typedef struct {
# include <linux/unistd.h> /* syscall(__NR_gettid) */
#endif
-static const char module_revision[] = "$Id: xine_input_vdr.c,v 1.334 2011-03-24 09:53:03 phintuka Exp $";
+static const char module_revision[] = "$Id: xine_input_vdr.c,v 1.335 2011-03-24 09:57:44 phintuka Exp $";
static const char log_module_input_vdr[] = "[input_vdr] ";
#define LOG_MODULENAME log_module_input_vdr
#define SysLogLevel iSysLogLevel
@@ -5684,14 +5684,14 @@ static int vdr_plugin_open_net (input_plugin_t *this_gen)
if((this->fd_data = connect_pipe_data_stream(this)) < 0) {
LOGMSG("Data stream connection failed (PIPE)");
} else {
- this->tcp = this->udp = this->tcp = 0;
+ this->tcp = this->udp = this->rtp = 0;
LOGMSG("Data stream connected (PIPE)");
}
}
/* try RTP ? */
- if(this->fd_data < 0 && !this->udp && !this->tcp) {
+ if(this->fd_data < 0 && this->rtp) {
/* flush control buffer (if PIPE was tried first) */
while(0 < read(this->fd_control, tmpbuf, 255)) ;
if((this->fd_data = connect_rtp_data_stream(this)) < 0) {