Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/input input_pnm.c,1.10,1.11 input_stdin_fifo.c,1.48,1.49 pnm.c,1.13,1.14 pnm.h,1.3,1.4
|
From: Miguel F. <mig...@us...> - 2003-04-13 18:49:17
|
Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1:/tmp/cvs-serv24756
Modified Files:
input_pnm.c input_stdin_fifo.c pnm.c pnm.h
Log Message:
xine_read_abort for pnm
Index: input_pnm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_pnm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- input_pnm.c 13 Apr 2003 16:02:54 -0000 1.10
+++ input_pnm.c 13 Apr 2003 18:49:12 -0000 1.11
@@ -218,7 +218,7 @@
printf ("input_pnm: trying to open '%s'\n", this->mrl);
#endif
- pnm = pnm_connect (this->mrl);
+ pnm = pnm_connect (this->stream, this->mrl);
if (!pnm) {
return 0;
Index: input_stdin_fifo.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_stdin_fifo.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- input_stdin_fifo.c 13 Apr 2003 17:31:40 -0000 1.48
+++ input_stdin_fifo.c 13 Apr 2003 18:49:12 -0000 1.49
@@ -366,7 +366,6 @@
stdin_input_class_t *this;
- printf ("input_stdin_fifo: init_class\n");
this = (stdin_input_class_t *) xine_xmalloc (sizeof (stdin_input_class_t));
this->xine = xine;
Index: pnm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/pnm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pnm.c 28 Feb 2003 02:51:48 -0000 1.13
+++ pnm.c 13 Apr 2003 18:49:12 -0000 1.14
@@ -40,6 +40,7 @@
#include "libreal/rmff.h"
#include "bswap.h"
#include "xineutils.h"
+#include "xine_internal.h"
/*
#define LOG
@@ -50,6 +51,8 @@
struct pnm_s {
+ xine_stream_t *stream;
+
int s;
char *host;
@@ -256,15 +259,16 @@
return total;
}
-static ssize_t rm_read(int fd, void *buf, size_t count) {
+static ssize_t rm_read(pnm_t *p, void *buf, size_t count) {
+#if 0
ssize_t ret, total;
total = 0;
while (total < count) {
- ret=read (fd, ((uint8_t*)buf)+total, count-total);
+ ret=read (p->s, ((uint8_t*)buf)+total, count-total);
if (ret<0) {
if(errno == EAGAIN) {
@@ -272,12 +276,12 @@
struct timeval timeout;
FD_ZERO (&rset);
- FD_SET (fd, &rset);
+ FD_SET (p->s, &rset);
timeout.tv_sec = 30;
timeout.tv_usec = 0;
- if (select (fd+1, &rset, NULL, NULL, &timeout) <= 0) {
+ if (select (p->s+1, &rset, NULL, NULL, &timeout) <= 0) {
return -1;
}
continue;
@@ -293,6 +297,11 @@
}
return total;
+#else
+
+ return xine_read_abort(p->stream, p->s, buf, count );
+
+#endif
}
/*
@@ -355,11 +364,11 @@
char *ptr;
/* get first PREAMBLE_SIZE bytes and ignore checksum */
- rm_read (p->s, data, CHECKSUM_SIZE);
+ rm_read (p, data, CHECKSUM_SIZE);
if (data[0] == 0x72)
- rm_read (p->s, data, PREAMBLE_SIZE);
+ rm_read (p, data, PREAMBLE_SIZE);
else
- rm_read (p->s, data+CHECKSUM_SIZE, PREAMBLE_SIZE-CHECKSUM_SIZE);
+ rm_read (p, data+CHECKSUM_SIZE, PREAMBLE_SIZE-CHECKSUM_SIZE);
*chunk_type = be2me_32(*((uint32_t *)data));
chunk_size = be2me_32(*((uint32_t *)(data+4)));
@@ -368,7 +377,7 @@
case PNA_TAG:
*need_response=0;
ptr=data+PREAMBLE_SIZE;
- rm_read (p->s, ptr++, 1);
+ rm_read (p, ptr++, 1);
while(1) {
/* The pna chunk is devided into subchunks.
@@ -381,17 +390,17 @@
* if first byte is 'F', we got an error
*/
- rm_read (p->s, ptr, 2);
+ rm_read (p, ptr, 2);
if (*ptr == 'X') /* checking for server message */
{
printf("input_pnm: got a message from server:\n");
- rm_read (p->s, ptr+2, 1);
+ rm_read (p, ptr+2, 1);
/* two bytes of message length*/
n=be2me_16(*(uint16_t*)(ptr+1));
/* message itself */
- rm_read (p->s, ptr+3, n);
+ rm_read (p, ptr+3, n);
ptr[3+n]=0;
printf("%s\n",ptr+3);
return -1;
@@ -411,11 +420,11 @@
}
if (*ptr != 0x4f) break;
n=ptr[1];
- rm_read (p->s, ptr+2, n);
+ rm_read (p, ptr+2, n);
ptr+=(n+2);
}
/* the checksum of the next chunk is ignored here */
- rm_read (p->s, ptr+2, 1);
+ rm_read (p, ptr+2, 1);
ptr+=3;
chunk_size=ptr-data;
break;
@@ -427,11 +436,11 @@
if (chunk_size > max) {
printf("error: max chunk size exeeded (max was 0x%04x)\n", max);
/* reading some bytes for debugging */
- n=rm_read (p->s, &data[PREAMBLE_SIZE], 0x100 - PREAMBLE_SIZE);
+ n=rm_read (p, &data[PREAMBLE_SIZE], 0x100 - PREAMBLE_SIZE);
hexdump(data,n+PREAMBLE_SIZE);
return -1;
}
- rm_read (p->s, &data[PREAMBLE_SIZE], chunk_size-PREAMBLE_SIZE);
+ rm_read (p, &data[PREAMBLE_SIZE], chunk_size-PREAMBLE_SIZE);
break;
default:
*chunk_type = 0;
@@ -603,7 +612,7 @@
/* read challenge */
memcpy (p->buffer, ptr, PREAMBLE_SIZE);
- rm_read (p->s, &p->buffer[PREAMBLE_SIZE], 64);
+ rm_read (p, &p->buffer[PREAMBLE_SIZE], 64);
/* now write a data header */
memcpy(ptr, pnm_data_header, PNM_DATA_HEADER_SIZE);
@@ -713,13 +722,13 @@
* <i2> is a 8 bit index which counts from 0x10 to somewhere
*/
- n = rm_read (p->s, p->buffer, 8);
+ n = rm_read (p, p->buffer, 8);
if (n<8) return 0;
/* skip 8 bytes if 0x62 is read */
if (p->buffer[0] == 0x62)
{
- n = rm_read (p->s, p->buffer, 8);
+ n = rm_read (p, p->buffer, 8);
if (n<8) return 0;
#ifdef LOG
printf("input_pnm: had to seek 8 bytes on 0x62\n");
@@ -731,7 +740,7 @@
{
int size=be2me_16(*(uint16_t*)(&p->buffer[1]));
- rm_read (p->s, &p->buffer[8], size-5);
+ rm_read (p, &p->buffer[8], size-5);
p->buffer[size+3]=0;
printf("input_pnm: got message from server while reading stream:\n%s\n", &p->buffer[3]);
return 0;
@@ -752,7 +761,7 @@
for (i=1; i<8; i++) {
p->buffer[i-1]=p->buffer[i];
}
- rm_read (p->s, &p->buffer[7], 1);
+ rm_read (p, &p->buffer[7], 1);
n++;
}
@@ -781,7 +790,7 @@
p->seq_current[0]=be2me_16(*(uint16_t*)(&p->buffer[5]));
/* now read the rest of stream chunk */
- n = rm_read (p->s, &p->recv[5], fof1-5);
+ n = rm_read (p, &p->recv[5], fof1-5);
if (n<(fof1-5)) return 0;
/* get second index */
@@ -818,12 +827,12 @@
return fof1;
}
-pnm_t *pnm_connect(const char *mrl) {
+pnm_t *pnm_connect(xine_stream_t *stream, const char *mrl) {
char *mrl_ptr=strdup(mrl);
char *slash, *colon;
int pathbegin, hostend;
- pnm_t *p=xine_xmalloc(sizeof(pnm_t));
+ pnm_t *p;
int fd;
int need_response=0;
@@ -834,6 +843,8 @@
mrl_ptr+=6;
+ p=xine_xmalloc(sizeof(pnm_t));
+ p->stream = stream;
p->port=7070;
p->url=strdup(mrl);
p->packet=0;
Index: pnm.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/pnm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pnm.h 31 Jan 2003 14:06:17 -0000 1.3
+++ pnm.h 13 Apr 2003 18:49:13 -0000 1.4
@@ -28,11 +28,11 @@
#ifndef __CYGWIN__
#include <inttypes.h>
#endif
-/*#include "xine_internal.h" */
+#include "xine_internal.h"
typedef struct pnm_s pnm_t;
-pnm_t* pnm_connect (const char *url);
+pnm_t* pnm_connect (xine_stream_t *stream, const char *url);
int pnm_read (pnm_t *this, char *data, int len);
void pnm_close (pnm_t *this);
|