diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-10-13 00:30:37 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-10-13 00:30:37 +0100 |
commit | 9c92484c911e0f3d401a0230c90c4bcf40b84c05 (patch) | |
tree | 4248cd1333a272bde1d21b598ea1108f186dd050 /src/input | |
parent | 9063eb601ef82bb5a43faf2cc07ab87af9fd8977 (diff) | |
parent | 574282f24812a9cfac7f120e08115b29362f44fa (diff) | |
download | xine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.gz xine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.bz2 |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/input_cdda.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index ff14b5790..23378a8b1 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -146,7 +146,7 @@ typedef struct { char *disc_category; int fd; - unsigned long disc_id; + uint32_t disc_id; int disc_length; trackinfo_t *track; @@ -1884,7 +1884,7 @@ static unsigned int _cdda_cddb_sum(int n) { } return ret; } -static unsigned long _cdda_calc_cddb_id(cdda_input_plugin_t *this) { +static uint32_t _cdda_calc_cddb_id(cdda_input_plugin_t *this) { int i, tsum = 0; if(this == NULL || (this->cddb.num_tracks <= 0)) @@ -1944,7 +1944,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) { /* * return cbbd disc id. */ -static unsigned long _cdda_get_cddb_id(cdda_input_plugin_t *this) { +static uint32_t _cdda_get_cddb_id(cdda_input_plugin_t *this) { if(this == NULL || (this->cddb.num_tracks <= 0)) return 0; |