diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
| commit | 4467de60c581f2a5f7ae737c30ab63be0e3f6e25 (patch) | |
| tree | 37d2893e34f613a65383f9288d0af3b985fcd85f /src/input/input_dvb.c | |
| parent | 81c84b6bf06482c5988fd16f68050177c1afc358 (diff) | |
| parent | 9f105cfe9059df4a9a1f5278679151a5d9c387f6 (diff) | |
| download | xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.gz xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.bz2 | |
Merge from 1.1
Diffstat (limited to 'src/input/input_dvb.c')
| -rw-r--r-- | src/input/input_dvb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 0fac0290a..cb2c48e2c 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -587,11 +587,11 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) this->xine = xine; this->adapter_num = adapter; - asprintf(&this->demux_device,"/dev/dvb/adapter%i/demux0",this->adapter_num); - asprintf(&this->dvr_device,"/dev/dvb/adapter%i/dvr0",this->adapter_num); - asprintf(&video_device,"/dev/dvb/adapter%i/video0",this->adapter_num); + this->demux_device = _x_asprintf("/dev/dvb/adapter%i/demux0",this->adapter_num); + this->dvr_device = _x_asprintf("/dev/dvb/adapter%i/dvr0",this->adapter_num); + video_device = _x_asprintf("/dev/dvb/adapter%i/video0",this->adapter_num); - asprintf(&frontend_device,"/dev/dvb/adapter%i/frontend0",this->adapter_num); + frontend_device = _x_asprintf("/dev/dvb/adapter%i/frontend0",this->adapter_num); if ((this->fd_frontend = xine_open_cloexec(frontend_device, O_RDWR)) < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "FRONTEND DEVICE: %s\n", strerror(errno)); tuner_dispose(this); @@ -3224,7 +3224,7 @@ static char **dvb_class_get_autoplay_list(input_class_t * this_gen, ch < num_channels && ch < MAX_AUTOCHANNELS; ++ch, ++apch) { free(class->autoplaylist[apch]); - asprintf(&(class->autoplaylist[apch]), "dvb://%s", channels[ch].name); + class->autoplaylist[apch] = _x_asprintf("dvb://%s", channels[ch].name); _x_assert(class->autoplaylist[apch] != NULL); } @@ -3232,10 +3232,10 @@ static char **dvb_class_get_autoplay_list(input_class_t * this_gen, free(class->autoplaylist[0]); if (default_channel != -1) /* plugin has been used before - channel is valid */ - asprintf (&(class->autoplaylist[0]), "dvb://%s", channels[default_channel].name); + class->autoplaylist[0] = _x_asprintf("dvb://%s", channels[default_channel].name); else /* set a reasonable default - the first channel */ - asprintf (&(class->autoplaylist[0]), "dvb://%s", num_channels ? channels[0].name : "0"); + class->autoplaylist[0] = _x_asprintf("dvb://%s", num_channels ? channels[0].name : "0"); } free_channel_list(channels, num_channels); |