Mercurial > hg > svcore
comparison data/fileio/OggVorbisFileReader.cpp @ 1056:c4898e57eea5 tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 23 Mar 2015 10:04:48 +0000 |
parents | 1ecd533a9977 |
children | a1cd5abcb38b |
comparison
equal
deleted
inserted
replaced
1007:ba404199345f | 1056:c4898e57eea5 |
---|---|
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) { |