diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-08 02:01:36 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-08 02:01:36 +0000 |
| commit | 07df287814b0b7e6875debecdb51bdd496872812 (patch) | |
| tree | a9caa62d0068f8969e659cef93ec610657dbc5e8 /src/input | |
| parent | 682ea4a0a64795c864c992fa09f795df0ec8f3ec (diff) | |
| parent | e066b69435f814b48e7646c75e3db4b726bf5cf6 (diff) | |
| download | xine-lib-07df287814b0b7e6875debecdb51bdd496872812.tar.gz xine-lib-07df287814b0b7e6875debecdb51bdd496872812.tar.bz2 | |
Merge from 1.2 main.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/input_cdda.c | 4 | ||||
| -rw-r--r-- | src/input/input_dvb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 0b7f854e2..31bc51bc2 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1483,7 +1483,7 @@ static void _cdda_parse_cddb_info (cdda_input_plugin_t *this, char *buffer, char static int _cdda_load_cached_cddb_infos(cdda_input_plugin_t *this) { DIR *dir; - const char *const xdg_cache_home = xdgCacheHome(this->stream->xine->basedir_handle); + const char *const xdg_cache_home = xdgCacheHome(&this->stream->xine->basedir_handle); if(this == NULL) return 0; @@ -1545,7 +1545,7 @@ static void _cdda_save_cached_cddb_infos(cdda_input_plugin_t *this, char *fileco FILE *fd; char *cfile; - const char *const xdg_cache_home = xdgCacheHome(this->stream->xine->basedir_handle); + const char *const xdg_cache_home = xdgCacheHome(&this->stream->xine->basedir_handle); if((this == NULL) || (filecontent == NULL)) return; diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 5b8afef92..a045276d5 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -887,7 +887,7 @@ static channel_t *load_channels(xine_t *xine, xine_stream_t *stream, int *num_ch int num_alloc = 0; struct stat st; - snprintf(filename, BUFSIZE, "%s/"PACKAGE"/channels.conf", xdgConfigHome(xine->basedir_handle)); + snprintf(filename, BUFSIZE, "%s/"PACKAGE"/channels.conf", xdgConfigHome(&xine->basedir_handle)); f = fopen(filename, "r"); if (!f) { |