adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix to enable compiling on 64 bit archs, closes #1

This commit is contained in:
darkeye 2006-12-23 16:52:05 +00:00
parent 5b429c0d83
commit 612ab7b1ff
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
darkice/trunk/AUTHORS
View File

@ -25,4 +25,5 @@ with contributions by:
Nicholas J. Humfrey <njh@ecs.soton.ac.uk> Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
Joel Ebel <jbebel@ncsu.edu> Joel Ebel <jbebel@ncsu.edu>
<jochen2@users.sourceforge.net> <jochen2@users.sourceforge.net>
Alexander Vlasov <zulu@galaradio.com>

5
darkice/trunk/ChangeLog
View File

@ -1,3 +1,8 @@
DarkIce next release
o fix to enable compiling on 64 bit platforms
thanks to Alexander Vlasov <zulu@galaradio.com>
19-05-2006 DarkIce 0.17.1 released 19-05-2006 DarkIce 0.17.1 released
o bugfix: automatic reconnect works more reliably o bugfix: automatic reconnect works more reliably

1
darkice/trunk/man/darkice.1
View File

@ -98,6 +98,7 @@ Developed with contributions by
Nicholas J. Humfrey <njh@ecs.soton.ac.uk> Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
Joel Ebel <jbebel@ncsu.edu> Joel Ebel <jbebel@ncsu.edu>
<jochen2@users.sourceforge.net> <jochen2@users.sourceforge.net>
Alexander Vlasov <zulu@galaradio.com>
.SH LINKS .SH LINKS
Project homepage: Project homepage:

6
darkice/trunk/src/LameLibEncoder.cpp
View File

@ -79,10 +79,12 @@ LameLibEncoder :: open ( void )
lameGlobalFlags = lame_init(); lameGlobalFlags = lame_init();
// ugly lame returns -1 in a pointer on allocation errors // ugly lame returns -1 in a pointer on allocation errors
if ( !lameGlobalFlags || ((int)lameGlobalFlags) == -1 ) { // this is cast to (long int) so that the pointer can be handled
// on 64 bit systems as well
if ( !lameGlobalFlags || ((long int)lameGlobalFlags) == -1 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"lame lib init error", "lame lib init error",
(int) lameGlobalFlags); (long int) lameGlobalFlags);
} }
if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) { if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) {