summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@users.sourceforge.net>2004-05-05 09:16:59 +0000
committerBastien Nocera <hadess@users.sourceforge.net>2004-05-05 09:16:59 +0000
commit96d133c218fa2bce388a0e20dec3eb7760b42073 (patch)
tree6311f632b68eeda7062d75fa51ce8b5f31f642df
parenteb5fedbbd6adfbb7a4e91e53bc70b5f48592c10f (diff)
downloadxine-lib-96d133c218fa2bce388a0e20dec3eb7760b42073.tar.gz
xine-lib-96d133c218fa2bce388a0e20dec3eb7760b42073.tar.bz2
- actually set the CD Index ID, fix warnings
CVS patchset: 6486 CVS date: 2004/05/05 09:16:59
-rw-r--r--src/input/input_cdda.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index d2025c4d2..8b2b88ddd 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.53 2004/05/05 09:11:39 hadess Exp $
+ * $Id: input_cdda.c,v 1.54 2004/05/05 09:16:59 hadess Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -55,6 +55,7 @@
*/
#include "sha1.h"
+#include "base64.h"
#include "xine_internal.h"
#include "xineutils.h"
#include "input_plugin.h"
@@ -1706,7 +1707,8 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) {
char temp[10];
SHA_INFO sha;
unsigned char digest[33], *base64;
- int i, size;
+ int i;
+ unsigned long size;
sha_init(&sha);
@@ -1733,8 +1735,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) {
base64 = rfc822_binary(digest, 20, &size);
base64[size] = 0;
- printf ("disc id: %s\n", base64);
- //_x_meta_info_set(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64);
+ _x_meta_info_set(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64);
free (base64);
}