annotate libmpdemux/stream.c @ 2845:b512c5b40b0d

c++ compiler would also be handy during build
author eyck
date Sun, 11 Nov 2001 21:08:30 +0000
parents 98769cea155c
children 606bb6943ae9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
1
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
2 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
3 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
4 #include <unistd.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
5
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
6 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
7 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
8 #include <sys/ioctl.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
9 #include <fcntl.h>
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
10 #include <signal.h>
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
11
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
12 #include "config.h"
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
13 #include "mp_msg.h"
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
14 #include "help_mp.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
15
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
16 #include "stream.h"
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
17
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
18 extern int verbose; // defined in mplayer.c
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
20 #ifdef __FreeBSD__
2310
9e059416eea6 libdemuxer...
arpi
parents: 2144
diff changeset
21 #include "vcd_read_fbsd.h"
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
22 #else
2310
9e059416eea6 libdemuxer...
arpi
parents: 2144
diff changeset
23 #include "vcd_read.h"
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
24 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
26 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
27 int dvd_read_sector(void* d,void* p2);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
28 void dvd_seek(void* d,off_t pos);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
29 #endif
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
30
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 //=================== STREAMER =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 int stream_fill_buffer(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
38 case STREAMTYPE_STREAM:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 len=vcd_cache_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 len=vcd_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 #endif
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
46 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
47 case STREAMTYPE_DVD: {
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
48 off_t pos=dvd_read_sector(s->priv,s->buffer);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
49 if(pos>=0){
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
50 len=2048; // full sector
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
51 s->pos=2048*pos-len;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
52 } else len=-1; // error
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
53 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
54 }
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
55 #endif
2790
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
56 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
57 case STREAMTYPE_TV:
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
58 {
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
59 len = 0;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
60 break;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
61 }
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
62 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 default: len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 s->buf_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 s->buf_len=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 s->pos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 // printf("[%d]",len);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
73 int stream_seek_long(stream_t *s,off_t pos){
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
74 off_t newpos;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
76 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
82 case STREAMTYPE_STREAM:
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
83 #ifdef _LARGEFILE_SOURCE
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
84 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break;
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
85 #else
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 180
diff changeset
86 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break;
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
87 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break;
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
90 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
91 newpos=pos/2048; newpos*=2048; break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
94 if(verbose>=3){
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
95 #ifdef _LARGEFILE_SOURCE
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
96 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
97 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
98 #else
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
99 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
100 (unsigned int)s->pos,newpos,pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
101 #endif
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
102 }
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
103
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 pos-=newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 if(newpos==0 || newpos!=s->pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
109 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110 if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112 case STREAMTYPE_VCD:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
113 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
115 vcd_cache_seek(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
116 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 vcd_set_msf(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 break;
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
120 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
121 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
122 s->pos=newpos; // real seek
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
123 dvd_seek(s->priv,s->pos/2048);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
124 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
125 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
126 case STREAMTYPE_STREAM:
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
127 //s->pos=newpos; // real seek
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
128 if(newpos<s->pos){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
129 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n");
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
130 return 1;
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
131 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
132 while(s->pos<newpos){
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
133 if(stream_fill_buffer(s)<=0) break; // EOF
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
134 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
135 break;
2790
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
136 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
137 case STREAMTYPE_TV:
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
138 s->pos=newpos; /* no sense */
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
139 break;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
140 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 // putchar('.');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143 //} else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144 // putchar('%');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
145 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 stream_fill_buffer(s);
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
148 if(pos>=0 && pos<=s->buf_len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 s->buf_pos=pos; // byte position in sector
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 }
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
152
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
153 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n");
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
154
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
155 #ifdef _LARGEFILE_SOURCE
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
156 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos));
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
157 #else
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
158 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos));
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
159 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 void stream_reset(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165 if(s->eof){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166 s->pos=0; //ftell(f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
167 // s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168 s->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 //stream_seek(s,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
171 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
173 stream_t* new_memory_stream(unsigned char* data,int len){
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
174 stream_t *s=malloc(sizeof(stream_t)+len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
175 s->fd=-1;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
176 s->type=STREAMTYPE_MEMORY;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
177 s->buf_pos=0; s->buf_len=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
178 s->start_pos=0; s->end_pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
179 stream_reset(s);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
180 s->pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
181 memcpy(s->buffer,data,len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
182 return s;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
183 }
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
184
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
185 stream_t* new_stream(int fd,int type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186 stream_t *s=malloc(sizeof(stream_t));
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
187 s->fd=fd;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
188 s->type=type;
180
afa2c05cfe43 terrible fatal bug fixed
arpi_esp
parents: 1
diff changeset
189 s->buf_pos=s->buf_len=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 578
diff changeset
190 s->start_pos=s->end_pos=0;
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
191 s->priv=NULL;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
192 s->cache_pid=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
193 stream_reset(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
194 return s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
195 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 void free_stream(stream_t *s){
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
198 printf("*** free_stream() called ***\n");
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
199 if(s->cache_pid) kill(s->cache_pid,SIGTERM);
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
200 if(s->priv) free(s->priv);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
201 free(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203