Update of /cvsroot/audacity/audacity-src/src/export
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7402
Modified Files:
ExportMP3.cpp
Log Message:
Fix unicode building on Intel.
Index: ExportMP3.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportMP3.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ExportMP3.cpp 25 Oct 2006 08:55:30 -0000 1.46
+++ ExportMP3.cpp 13 Dec 2006 02:36:28 -0000 1.47
@@ -555,7 +555,7 @@
void *handle = NULL;
if (wxFileExists(mLibPath))
{
- handle = dlopen(mLibPath, RTLD_LAZY);
+ handle = dlopen(OSFILENAME(mLibPath), RTLD_LAZY);
if (!handle)
return false;
@@ -564,37 +564,38 @@
return false;
/* get function pointers from the shared library */
+ /* LLL - The symbols names should not be converted to unicode */
- lame_init = (lame_init_t *)dlsym(handle, wxT("lame_init"));
- get_lame_version = (get_lame_version_t *)dlsym(handle,
wxT("get_lame_version"));
+ lame_init = (lame_init_t *)dlsym(handle, "lame_init");
+ get_lame_version = (get_lame_version_t *)dlsym(handle,
"get_lame_version");
lame_init_params =
- (lame_init_params_t *) dlsym(handle, wxT("lame_init_params"));
+ (lame_init_params_t *) dlsym(handle, "lame_init_params");
lame_encode_buffer =
- (lame_encode_buffer_t *) dlsym(handle,
wxT("lame_encode_buffer"));
+ (lame_encode_buffer_t *) dlsym(handle, "lame_encode_buffer");
lame_encode_buffer_interleaved =
- (lame_encode_buffer_interleaved_t *) dlsym(handle,
wxT("lame_encode_buffer_interleaved"));
+ (lame_encode_buffer_interleaved_t *) dlsym(handle,
"lame_encode_buffer_interleaved");
lame_encode_flush =
- (lame_encode_flush_t *) dlsym(handle,
wxT("lame_encode_flush"));
+ (lame_encode_flush_t *) dlsym(handle, "lame_encode_flush");
lame_close =
- (lame_close_t *) dlsym(handle, wxT("lame_close"));
+ (lame_close_t *) dlsym(handle, "lame_close");
lame_close =
- (lame_close_t *) dlsym(handle, wxT("lame_close"));
+ (lame_close_t *) dlsym(handle, "lame_close");
lame_set_in_samplerate =
- (lame_set_in_samplerate_t *) dlsym(handle,
wxT("lame_set_in_samplerate"));
+ (lame_set_in_samplerate_t *) dlsym(handle,
"lame_set_in_samplerate");
lame_set_out_samplerate =
- (lame_set_out_samplerate_t *) dlsym(handle,
wxT("lame_set_out_samplerate"));
+ (lame_set_out_samplerate_t *) dlsym(handle,
"lame_set_out_samplerate");
lame_set_num_channels =
- (lame_set_num_channels_t *) dlsym(handle,
wxT("lame_set_num_channels"));
+ (lame_set_num_channels_t *) dlsym(handle,
"lame_set_num_channels");
lame_set_quality =
- (lame_set_quality_t *) dlsym(handle, wxT("lame_set_quality"));
+ (lame_set_quality_t *) dlsym(handle, "lame_set_quality");
lame_get_quality =
- (lame_get_quality_t *) dlsym(handle, wxT("lame_get_quality"));
+ (lame_get_quality_t *) dlsym(handle, "lame_get_quality");
lame_set_brate =
- (lame_set_brate_t *) dlsym(handle, wxT("lame_set_brate"));
+ (lame_set_brate_t *) dlsym(handle, "lame_set_brate");
lame_get_brate =
- (lame_get_brate_t *) dlsym(handle, wxT("lame_get_brate"));
+ (lame_get_brate_t *) dlsym(handle, "lame_get_brate");
/* we assume that if all the symbols are found, it's a valid
library */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
