mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-14 04:49:43 +01:00
Code Issues Releases Wiki Activity

Change device name string handling to use safe conversion to CString (Was causing issues on OSX 10.6.5 Japanese)

Browse Source 
(cherry picked from commit 17fb7abb8c88bf9ae45bff349d473e9224e8174e)
This commit is contained in:
Alejandro Wainzinger 2010-12-05 17:27:27 -08:00
parent b45c254081
commit a87868c1f5
1 changed files with 15 additions and 2 deletions

17
rtaudio/RtAudio.cpp

@ -558,7 +558,14 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
return info; return info;
} }
const char *mname = CFStringGetCStringPtr( cfname, CFStringGetSystemEncoding() ); CFIndex numbytes_cfname = CFStringGetMaximumSizeOfFileSystemRepresentation( cfname );
if( numbytes_cfname == 0 )
numbytes_cfname=256;
char mname[numbytes_cfname];
if(! CFStringGetCString( cfname, mname,numbytes_cfname,CFStringGetSystemEncoding() ) )
strcpy(mname,"");
info.name.append( (const char *)mname, strlen(mname) ); info.name.append( (const char *)mname, strlen(mname) );
info.name.append( ": " ); info.name.append( ": " );
CFRelease( cfname ); CFRelease( cfname );
@ -572,7 +579,13 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
return info; return info;
} }
const char *name = CFStringGetCStringPtr( cfname, CFStringGetSystemEncoding() ); numbytes_cfname = CFStringGetMaximumSizeOfFileSystemRepresentation( cfname );
if( numbytes_cfname == 0 )
numbytes_cfname=256;
char name[numbytes_cfname];
if(! CFStringGetCString( cfname, name,numbytes_cfname,CFStringGetSystemEncoding() ) )
strcpy(mname,"");
info.name.append( (const char *)name, strlen(name) ); info.name.append( (const char *)name, strlen(name) );
CFRelease( cfname ); CFRelease( cfname );