comparison data/fileio/OggVorbisFileReader.cpp @ 1037:bf0e5944289b cxx11

Merge from default branch
author Chris Cannam
date Tue, 03 Mar 2015 09:33:59 +0000
parents 1ecd533a9977
children a1cd5abcb38b
comparison
equal deleted inserted replaced
1027:ce1077bd663a 1037:bf0e5944289b
171 { 171 {
172 OggVorbisFileReader *reader = (OggVorbisFileReader *)data; 172 OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
173 173
174 if (!reader->m_commentsRead) { 174 if (!reader->m_commentsRead) {
175 const FishSoundComment *comment; 175 const FishSoundComment *comment;
176 comment = fish_sound_comment_first_byname(fs, "TITLE"); 176 comment = fish_sound_comment_first_byname(fs, (char *)"TITLE");
177 if (comment && comment->value) { 177 if (comment && comment->value) {
178 reader->m_title = QString::fromUtf8(comment->value); 178 reader->m_title = QString::fromUtf8(comment->value);
179 } 179 }
180 comment = fish_sound_comment_first_byname(fs, "ARTIST"); 180 comment = fish_sound_comment_first_byname(fs, (char *)"ARTIST");
181 if (comment && comment->value) { 181 if (comment && comment->value) {
182 reader->m_maker = QString::fromUtf8(comment->value); 182 reader->m_maker = QString::fromUtf8(comment->value);
183 } 183 }
184 comment = fish_sound_comment_first(fs); 184 comment = fish_sound_comment_first(fs);
185 while (comment) { 185 while (comment) {