Mercurial > mplayer.hg

comparison stream/stream_dvb.c @ 27370:14c5017f40d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Sun, 03 Aug 2008 15:21:40 +0000
parents 16ab100f5870
children bb738b9ea7c4
comparison
equal deleted inserted replaced
27369:8598536ca4f5 27370:14c5017f40d2
286 ptr->cr =FEC_1_2; 286 ptr->cr =FEC_1_2;
287 else if(! strcmp(cr, "FEC_2_3")) 287 else if(! strcmp(cr, "FEC_2_3"))
288 ptr->cr =FEC_2_3; 288 ptr->cr =FEC_2_3;
289 else if(! strcmp(cr, "FEC_3_4")) 289 else if(! strcmp(cr, "FEC_3_4"))
290 ptr->cr =FEC_3_4; 290 ptr->cr =FEC_3_4;
291 #ifdef HAVE_DVB_HEAD 291 #ifdef CONFIG_DVB_HEAD
292 else if(! strcmp(cr, "FEC_4_5")) 292 else if(! strcmp(cr, "FEC_4_5"))
293 ptr->cr =FEC_4_5; 293 ptr->cr =FEC_4_5;
294 else if(! strcmp(cr, "FEC_6_7")) 294 else if(! strcmp(cr, "FEC_6_7"))
295 ptr->cr =FEC_6_7; 295 ptr->cr =FEC_6_7;
296 else if(! strcmp(cr, "FEC_8_9")) 296 else if(! strcmp(cr, "FEC_8_9"))
356 ptr->cr_lp =FEC_1_2; 356 ptr->cr_lp =FEC_1_2;
357 else if(! strcmp(tmp_lcr, "FEC_2_3")) 357 else if(! strcmp(tmp_lcr, "FEC_2_3"))
358 ptr->cr_lp =FEC_2_3; 358 ptr->cr_lp =FEC_2_3;
359 else if(! strcmp(tmp_lcr, "FEC_3_4")) 359 else if(! strcmp(tmp_lcr, "FEC_3_4"))
360 ptr->cr_lp =FEC_3_4; 360 ptr->cr_lp =FEC_3_4;
361 #ifdef HAVE_DVB_HEAD 361 #ifdef CONFIG_DVB_HEAD
362 else if(! strcmp(tmp_lcr, "FEC_4_5")) 362 else if(! strcmp(tmp_lcr, "FEC_4_5"))
363 ptr->cr_lp =FEC_4_5; 363 ptr->cr_lp =FEC_4_5;
364 else if(! strcmp(tmp_lcr, "FEC_6_7")) 364 else if(! strcmp(tmp_lcr, "FEC_6_7"))
365 ptr->cr_lp =FEC_6_7; 365 ptr->cr_lp =FEC_6_7;
366 else if(! strcmp(tmp_lcr, "FEC_8_9")) 366 else if(! strcmp(tmp_lcr, "FEC_8_9"))
379 ptr->hier = HIERARCHY_1; 379 ptr->hier = HIERARCHY_1;
380 else if(! strcmp(tmp_hier, "HIERARCHY_2")) 380 else if(! strcmp(tmp_hier, "HIERARCHY_2"))
381 ptr->hier = HIERARCHY_2; 381 ptr->hier = HIERARCHY_2;
382 else if(! strcmp(tmp_hier, "HIERARCHY_4")) 382 else if(! strcmp(tmp_hier, "HIERARCHY_4"))
383 ptr->hier = HIERARCHY_4; 383 ptr->hier = HIERARCHY_4;
384 #ifdef HAVE_DVB_HEAD 384 #ifdef CONFIG_DVB_HEAD
385 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO")) 385 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
386 ptr->hier = HIERARCHY_AUTO; 386 ptr->hier = HIERARCHY_AUTO;
387 #endif 387 #endif
388 else ptr->hier = HIERARCHY_NONE; 388 else ptr->hier = HIERARCHY_NONE;
389 } 389 }
609 close(priv->demux_fds[i]); 609 close(priv->demux_fds[i]);
610 } 610 }
611 close(priv->dvr_fd); 611 close(priv->dvr_fd);
612 612
613 close(priv->fe_fd); 613 close(priv->fe_fd);
614 #ifdef HAVE_DVB 614 #ifdef CONFIG_DVB
615 close(priv->sec_fd); 615 close(priv->sec_fd);
616 #endif 616 #endif
617 617
618 priv->is_on = 0; 618 priv->is_on = 0;
619 dvb_free_config(priv->config); 619 dvb_free_config(priv->config);