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

Disabled (hopefully) the ogg tag reading on Win and Mac.

Browse source 
The scons build system still asks for the library,
thus the compiling might still be broken on scons based builds.
This commit is contained in:
fendrin 2013-05-22 00:20:31 +02:00
parent da5f32700a
commit e40af6407e
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sound_music_track.cpp
View file

@ -82,6 +82,10 @@ void music_track::resolve()
}
#if !defined(_WIN32) && !defined(__APPLE__)
<<<<<<< HEAD
=======
>>>>>>> Disabled (hopefully) the ogg tag reading on Win and Mac.
FILE* f;
f = fopen(file_path_.c_str(), "r");
if (f == NULL) {
@ -114,7 +118,13 @@ void music_track::resolve()
}
ov_clear(&vf);
<<<<<<< HEAD
#endif
=======
#endif
>>>>>>> Disabled (hopefully) the ogg tag reading on Win and Mac.
LOG_AUDIO << "resolved music track '" << id_ << "' into '" << file_path_ << "'\n";
}