Changeset 6556
- Timestamp:
- 03/20/12 22:35:53 (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-coolapi.c
r6521 r6556 106 106 } 107 107 108 int32_t coolapi_set_filter (int32_t fd, int32_t num, int32_t pid, unsigned char * flt, unsigned char * mask , int32_t type)108 int32_t coolapi_set_filter (int32_t fd, int32_t num, int32_t pid, unsigned char * flt, unsigned char * mask) 109 109 { 110 110 int32_t result; … … 156 156 157 157 /* FIXME 158 1) we need more than one filter for an EMM-PID, so we exclude the annoying CNXT_STATUS_DUPLICATE_PID (Code 99) which is probably(?) just a notification and not an error 159 2) rezap needed if this happens with an ECM-PID 158 we need more than one filter for an EMM-PID, so we exclude the annoying CNXT_STATUS_DUPLICATE_PID (Code 99) which is probably(?) just a notification and not an error 160 159 */ 161 160 162 if (result != 99) {161 if (result != 99) 163 162 check_error ("cnxt_dmx_channel_ctrl", result); 164 } else if (type==TYPE_ECM) {165 system("pzapit -rz");166 }167 163 168 164 dmx->pid = pid; … … 347 343 return 0; 348 344 } 349 cs_debug_mask(D_DVBAPI, "dmx channel %x pid %x len %d", (int) dmx->channel, dmx->pid, len);345 //cs_debug_mask(D_DVBAPI, "dmx channel %x pid %x len %d", (int) dmx->channel, dmx->pid, len); 350 346 351 347 result = cnxt_cbuf_get_used(dmx->buffer2, &bytes_used); … … 369 365 done += 3; 370 366 371 cs_debug_mask(D_DVBAPI, "bytes read %d\n", done);367 //cs_debug_mask(D_DVBAPI, "bytes read %d\n", done); 372 368 return done; 373 369 } -
trunk/module-dvbapi.c
r6551 r6556 168 168 demux[demux_id].demux_fd[n].fd = coolapi_open_device(demux[demux_id].demux_index, demux_id); 169 169 if(demux[demux_id].demux_fd[n].fd > 0) 170 ret = coolapi_set_filter(demux[demux_id].demux_fd[n].fd, n, pid, filt, mask , type);170 ret = coolapi_set_filter(demux[demux_id].demux_fd[n].fd, n, pid, filt, mask); 171 171 break; 172 172 #endif … … 1350 1350 1351 1351 for (i = 0; i < MAX_DEMUX; i++) { 1352 #ifdef COOL 1353 if (demux[i].program_number==((buffer[1] << 8) | buffer[2])) { 1354 #else 1352 1355 if (connfd>0 && demux[i].socket_fd == connfd) { 1356 #endif 1353 1357 //PMT Update 1354 1358 if (ca_pmt_list_management == 0x05) { -
trunk/module-dvbapi.h
r6521 r6556 350 350 void coolapi_open_all(); 351 351 void coolapi_close_all(); 352 int32_t coolapi_set_filter (int32_t fd, int32_t num, int32_t pid, unsigned char * flt, unsigned char * mask , int32_t type);352 int32_t coolapi_set_filter (int32_t fd, int32_t num, int32_t pid, unsigned char * flt, unsigned char * mask); 353 353 int32_t coolapi_remove_filter (int32_t fd, int32_t num); 354 354 int32_t coolapi_open_device (int32_t demux_index, int32_t demux_id);
Note:
See TracChangeset
for help on using the changeset viewer.