From 16ff7e67b49f70455400c5c0b8df2342a0a1c95f Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 10 Oct 2011 10:33:43 +0300 Subject: Removed unneeded data from oss_driver_s --- src/audio_out/audio_oss_out.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index ef77f6d7d..a68c6bd71 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -134,7 +134,6 @@ typedef struct oss_driver_s { int buffer_size; struct { - char *name; int fd; int prop; int volume; @@ -507,7 +506,6 @@ static void ao_oss_exit(ao_driver_t *this_gen) { if (this->audio_fd != -1) close(this->audio_fd); - free (this->mixer.name); free (this); } @@ -1019,6 +1017,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da */ { char mixer_name[32]; + char mixer_dev[32]; int mixer_num; int audio_devs; char *parse; @@ -1040,18 +1039,18 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da parse[0] = '\0'; parse += 3; if (devname_val == 0) - asprintf(&(this->mixer.name), "%smixer%s", mixer_name, parse); + snprintf(mixer_dev, sizeof(mixer_dev), "%smixer%s", mixer_name, parse); else { if (mixer_num == -1) - asprintf(&(this->mixer.name), "%smixer", mixer_name); + snprintf(mixer_dev, sizeof(mixer_dev), "%smixer", mixer_name); else - asprintf(&(this->mixer.name), "%smixer%d", mixer_name, mixer_num); + snprintf(mixer_dev, sizeof(mixer_dev), "%smixer%d", mixer_name, mixer_num); } } else { _x_abort(); } - this->mixer.fd = xine_open_cloexec(this->mixer.name, O_RDONLY); + this->mixer.fd = xine_open_cloexec(mixer_dev, O_RDONLY); if(this->mixer.fd != -1) { @@ -1079,7 +1078,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da } else xprintf (class->xine, XINE_VERBOSITY_LOG, - _("audio_oss_out: open() mixer %s failed: %s\n"), this->mixer.name, strerror(errno)); + _("audio_oss_out: open() mixer %s failed: %s\n"), mixer_dev, strerror(errno)); this->mixer.mute = 0; this->mixer.volume = ao_oss_get_property (&this->ao_driver, this->mixer.prop); -- cgit v1.2.3