Mercurial > mplayer.hg
changeset 25558:634dfaa85718
when :card isn't specified by the user search the first available card
| author | nicodvb |
|---|---|
| date | Wed, 02 Jan 2008 20:34:48 +0000 |
| parents | 0ed2d0aad31f |
| children | 4107f7e9402b |
| files | libao2/ao_mpegpes.c libvo/vo_mpegpes.c |
| diffstat | 2 files changed, 32 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_mpegpes.c Wed Jan 02 19:11:37 2008 +0000 +++ b/libao2/ao_mpegpes.c Wed Jan 02 20:34:48 2008 +0000 @@ -139,7 +139,7 @@ static int preinit(const char *arg) { - int card = 1; + int card = -1; char *ao_file = NULL; opt_t subopts[] = { @@ -153,6 +153,21 @@ mp_msg(MSGT_VO, MSGL_ERR, "AO_MPEGPES, Unrecognized options\n"); return -1; } + if(card==-1) + { + //search the first usable card + int n; + char file[30]; + for(n=0; n<4; n++) + { + sprintf(file, "/dev/dvb/adapter%d/audio0", n); + if(access(file, F_OK | W_OK)==0) + { + card = n+1; + break; + } + } + } if((card < 1) || (card > 4)) { mp_msg(MSGT_VO, MSGL_ERR, "DVB card number must be between 1 and 4\n");
--- a/libvo/vo_mpegpes.c Wed Jan 02 19:11:37 2008 +0000 +++ b/libvo/vo_mpegpes.c Wed Jan 02 20:34:48 2008 +0000 @@ -98,7 +98,7 @@ static int preinit(const char *arg){ #ifdef HAVE_DVB - int card = 0; + int card = -1; char vo_file[30], ao_file[30], *tmp; if(arg != NULL){ @@ -115,6 +115,21 @@ if(!arg){ //|O_NONBLOCK + //search the first usable card + if(card==-1) { + int n; + for(n=0; n<4; n++) { + sprintf(vo_file, "/dev/dvb/adapter%d/video0", n); + if(access(vo_file, F_OK | W_OK)==0) { + card = n; + break; + } + } + } + if(card==-1) { + mp_msg(MSGT_VO,MSGL_INFO, "Couldn't find a usable dvb video device, exiting\n"); + return -1; + } #ifndef HAVE_DVB_HEAD mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/video+audio\n"); sprintf(vo_file, "/dev/ost/video");