0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Demote all music_track::resolve() output to the info log level and clarify origin

Browse source 
Some of these error messages can seem duplicate in practice (if a track
can't be found, the playlist manager will complain again) or unfitting
(not all music tracks have to be in Ogg Vorbis format, or have
appropriate comments), hence they are more fitting for the info level
rather than the error level.
This commit is contained in:
Ignacio R. Morelle 2013-06-07 05:55:12 -04:00
parent a3fa9058c8
commit b9a35cb3db
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sound_music_track.cpp
View file

@ -70,14 +70,14 @@ music_track::music_track(const std::string& v_name) :
void music_track::resolve()
{
if (id_.empty()) {
ERR_AUDIO << "empty track filename specified\n";
LOG_AUDIO << "empty track filename specified for track identification\n";
return;
}
file_path_ = get_binary_file_location("music", id_);
if (file_path_.empty()) {
ERR_AUDIO << "could not find track '" << id_ << "'\n";
LOG_AUDIO << "could not find track '" << id_ << "' for track identification\n";
return;
}
@ -85,13 +85,13 @@ void music_track::resolve()
FILE* f;
f = fopen(file_path_.c_str(), "r");
if (f == NULL) {
ERR_AUDIO << "Error opening file '" << file_path_ << "'\n";
LOG_AUDIO << "Error opening file '" << file_path_ << "' for track identification\n";
return;
}
OggVorbis_File vf;
if(ov_open(f, &vf, NULL, 0) < 0) {
ERR_AUDIO << "track does not appear to be an Ogg file '" << id_ << "'\n";
LOG_AUDIO << "track does not appear to be an Ogg file '" << id_ << "', cannot be identified\n";
ov_clear(&vf);
return;
}
@ -110,7 +110,7 @@ void music_track::resolve()
}
}
if (!found) {
ERR_AUDIO << "No title for music track '" << id_ << "'\n";
LOG_AUDIO << "No title for music track '" << id_ << "'\n";
}
ov_clear(&vf);