Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix codepage conversion for shortlabel #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix codepage conversion for shortlabel #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/ensembledatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,22 @@ std::string label_t::shortlabel() const
}
}

return shortlabel;
switch (charset) {
case charset_e::COMPLETE_EBU_LATIN:
return convert_ebu_to_utf8( shortlabel );
case charset_e::UTF8:
return shortlabel;
case charset_e::UCS2:
try {
return ucs2toutf8((uint8_t*)shortlabel.c_str(), shortlabel.length());
}
catch (const range_error&) {
return "";
}
case charset_e::UNDEFINED:
throw logic_error("charset undefined");
}
throw logic_error("invalid charset " + to_string((int)charset));
}

string label_t::assemble() const
Expand Down