diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/FileAnalyzer.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/Matrix.cpp | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/FileAnalyzer.cpp b/src/FileAnalyzer.cpp index 690e40e..1f46150 100644 --- a/src/FileAnalyzer.cpp +++ b/src/FileAnalyzer.cpp @@ -20,9 +20,10 @@ namespace QuickMedia { // What about audio ogg files that are not opus? // TODO: Test all of these - static const std::array<MagicNumber, 19> magic_numbers = { + static const std::array<MagicNumber, 20> magic_numbers = { MagicNumber{ {'R', 'I', 'F', 'F', -1, -1, -1, -1, 'A', 'V', 'I', ' '}, 12, ContentType::VIDEO_AVI }, MagicNumber{ {0x00, 0x00, 0x00, -1, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm'}, 12, ContentType::VIDEO_MP4 }, + MagicNumber{ {0x00, 0x00, 0x00, -1, 'f', 't', 'y', 'p', 'm', 'p', '4', '2'}, 12, ContentType::VIDEO_MP4 }, MagicNumber{ {0x1A, 0x45, 0xDF, 0xA3}, 4, ContentType::VIDEO_WEBM }, MagicNumber{ {'.', 's', 'n', 'd'}, 4, ContentType::AUDIO_BASIC }, MagicNumber{ {'F', 'O', 'R', 'M', -1, -1, -1, -1, 'A', 'I', 'F', 'F'}, 12, ContentType::AUDIO_AIFF }, diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp index d81c53c..f7364d1 100644 --- a/src/plugins/Matrix.cpp +++ b/src/plugins/Matrix.cpp @@ -801,15 +801,15 @@ namespace QuickMedia { string_split(body, '\n', [&formatted_body, &contains_formatted_text, &line](const char *str, size_t size){ if(line > 0) formatted_body += "<br/>"; + std::string line_str(str, size); + html_escape_sequences(line_str); if(size > 0 && str[0] == '>') { - std::string line(str, size); - html_escape_sequences(line); formatted_body += "<font color=\"#789922\">"; - formatted_body += line; + formatted_body += line_str; formatted_body += "</font>"; contains_formatted_text = true; } else { - formatted_body.append(str, size); + formatted_body += line_str; } ++line; return true; |