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

Cross-platform music track reading

Browse source 
Works on at least Windows and Linux. May need testing for macOS.

Won't see a difference in Map Editor music tracks unless the way sound-utils.cfg macros are used (reading track titles from that file) is changed.
This commit is contained in:
Wedge009 2019-01-07 15:23:06 +11:00 • committed by Charles Dang
parent e0a65883c3
commit 897fbd2b10
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/sound_music_track.cpp
View file

@ -19,9 +19,7 @@
#include "filesystem.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
#if !defined(_WIN32) && !defined(__APPLE__)
#include "vorbis/vorbisfile.h"
#endif
static lg::log_domain log_audio("audio");
#define ERR_AUDIO LOG_STREAM(err, log_audio)
@ -83,21 +81,10 @@ void music_track::resolve()
return;
}
#if !defined(_WIN32) && !defined(__APPLE__)
if (title_.empty()) {
FILE* f;
f = fopen(file_path_.c_str(), "r");
if (f == nullptr) {
LOG_AUDIO << "Error opening file '" << file_path_
<< "' for track identification\n";
return;
}
OggVorbis_File vf;
if(ov_open(f, &vf, nullptr, 0) < 0) {
LOG_AUDIO << "track does not appear to be an Ogg file '"
<< id_ << "', cannot be identified\n";
if(ov_fopen(file_path_.c_str(), &vf) < 0) {
LOG_AUDIO << "Error opening file '" << file_path_ << "' for track identification\n";
ov_clear(&vf);
return;
}
@ -121,7 +108,6 @@ void music_track::resolve()
ov_clear(&vf);
}
#endif
LOG_AUDIO << "resolved music track '" << id_ << "' into '" << file_path_ << "'\n";
}