From e40af6407e8f1d86f753dea26a559476855dd802 Mon Sep 17 00:00:00 2001 From: fendrin Date: Wed, 22 May 2013 00:20:31 +0200 Subject: [PATCH] Disabled (hopefully) the ogg tag reading on Win and Mac. The scons build system still asks for the library, thus the compiling might still be broken on scons based builds. --- src/sound_music_track.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/sound_music_track.cpp b/src/sound_music_track.cpp index fedf6b25427..0348bfd9d17 100644 --- a/src/sound_music_track.cpp +++ b/src/sound_music_track.cpp @@ -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"; }