mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02: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
This commit is contained in:
Alejandro Wainzinger
2010-12-05 17:27:27 -08:00
parent e2f6d2891d
commit 17fb7abb8c
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtaudio/RtAudio.cpp
View File

@@ -558,7 +558,14 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
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( ": " );
CFRelease( cfname );
@@ -572,7 +579,13 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
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) );
CFRelease( cfname );