From: <mme...@gr...> - 2007-08-25 12:53:37
|
# HG changeset patch # User Matt Messier <mme...@gr...> # Date 1187534157 14400 # Node ID e2710f80c0d8f7ab5deebb1d258096286e8a0b51 # Parent 197c58d04b80d503cb5f97942fa0c6ba2060bcb8 Add a missing cast to fix a compile error in the previous rev diff -r e2710f80c0d8f7ab5deebb1d258096286e8a0b51 -r 197c58d04b80d503cb5f97942fa0c6ba2060bcb8 src/input/input_cdda.c --- a/src/input/input_cdda.c Sun Aug 19 10:35:57 2007 -0400 +++ b/src/input/input_cdda.c Sat Aug 18 23:04:40 2007 -0400 @@ -2018,8 +2018,10 @@ static int cdda_open(cdda_input_plugin_t static int cdda_open(cdda_input_plugin_t *this_gen, char *cdda_device, cdrom_toc *toc, int *fdd) { + xine_t *xine = ((cdda_input_class_t *)(this_gen->class))->xine; + *fdd = this_gen->fd = -1; - if (!(cdda_device = media_get_device (this_gen->class->xine, MEDIA_DEVICETYPE_RAWCD, cdda_device))) { + if (!(cdda_device = media_get_device (xine, MEDIA_DEVICETYPE_RAWCD, cdda_device))) { return -1; } /* now cdda_device must be freed via free() before returning */ @@ -2038,10 +2040,10 @@ static int cdda_open(cdda_input_plugin_t #ifdef CDROM_SELECT_SPEED if (this_gen->stream) { int speed; - speed = this_gen->stream->xine->config->lookup_entry(this_gen->stream->xine->config, + speed = xine->config->lookup_entry(xine->config, "media.audio_cd.drive_slowdown")->num_value; if (speed && ioctl(*fdd, CDROM_SELECT_SPEED, speed) != 0) - xprintf(this_gen->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf(xine, XINE_VERBOSITY_DEBUG, "input_cdda: setting drive speed to %d failed\n", speed); } #endif |