M3U and PLS playlist handlers now correctly handle macOS Classic line endings

CQTexperiment
Christopher Snowhill 2021-03-09 23:49:13 -08:00
parent ab6429b62b
commit ba7aaec69c
2 changed files with 20 additions and 0 deletions

View File

@ -92,6 +92,16 @@
filecontents[size] = '\0';
}
// Handle macOS Classic and Windows line endings
{
char * contentsscan = filecontents;
while (*contentsscan) {
if (*contentsscan == '\r')
*contentsscan = '\n';
++contentsscan;
}
}
DLog(@"Trying UTF8");
NSStringEncoding encoding = NSUTF8StringEncoding;

View File

@ -95,6 +95,16 @@
filecontents[size] = '\0';
}
// Handle macOS Classic and Windows line endings
{
char * contentsscan = filecontents;
while (*contentsscan) {
if (*contentsscan == '\r')
*contentsscan = '\n';
++contentsscan;
}
}
DLog(@"Trying UTF8");
NSStringEncoding encoding = NSUTF8StringEncoding;
NSString *contents = [NSString stringWithCString:filecontents encoding:encoding];