Mercurial > hg > forks > bilotrip-mj12
diff liboggplayer-src/src/imp.hpp @ 59:3eacedd172ab
Fence some lingering audio code, based on fixes from visy.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 06 Aug 2013 23:27:37 +0300 |
| parents | e29773ac3ceb |
| children | 9c63b355c82b |
line wrap: on
line diff
--- a/liboggplayer-src/src/imp.hpp Tue Aug 06 23:15:34 2013 +0300 +++ b/liboggplayer-src/src/imp.hpp Tue Aug 06 23:27:37 2013 +0300 @@ -40,7 +40,9 @@ bool parse_headers(); void open(std::string path, AudioFormat audio_format, int channels, int rate, VideoFormat video_format); +#ifdef VORBIS_SUPPORT bool decode_audio(); +#endif bool decode_video(); bool ready(); void play(); @@ -89,10 +91,12 @@ bool playing; boost::thread play_thread; + boost::mutex video_mut; + boost::condition_variable video_ready_cond; +#ifdef VORBIS_SUPPORT boost::mutex audio_mut; - boost::mutex video_mut; boost::condition_variable audio_ready_cond; - boost::condition_variable video_ready_cond; +#endif bool videobuf_ready; double videobuf_time;