Mercurial > hg > forks > bilotrip-mj12
comparison 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 |
comparison
equal
deleted
inserted
replaced
58:1099b8eb152a | 59:3eacedd172ab |
---|---|
38 void close(); | 38 void close(); |
39 bool init_decoders(); | 39 bool init_decoders(); |
40 bool parse_headers(); | 40 bool parse_headers(); |
41 void open(std::string path, AudioFormat audio_format, int channels, | 41 void open(std::string path, AudioFormat audio_format, int channels, |
42 int rate, VideoFormat video_format); | 42 int rate, VideoFormat video_format); |
43 #ifdef VORBIS_SUPPORT | |
43 bool decode_audio(); | 44 bool decode_audio(); |
45 #endif | |
44 bool decode_video(); | 46 bool decode_video(); |
45 bool ready(); | 47 bool ready(); |
46 void play(); | 48 void play(); |
47 void play_loop(); | 49 void play_loop(); |
48 | 50 |
87 #endif | 89 #endif |
88 | 90 |
89 bool playing; | 91 bool playing; |
90 | 92 |
91 boost::thread play_thread; | 93 boost::thread play_thread; |
94 boost::mutex video_mut; | |
95 boost::condition_variable video_ready_cond; | |
96 #ifdef VORBIS_SUPPORT | |
92 boost::mutex audio_mut; | 97 boost::mutex audio_mut; |
93 boost::mutex video_mut; | |
94 boost::condition_variable audio_ready_cond; | 98 boost::condition_variable audio_ready_cond; |
95 boost::condition_variable video_ready_cond; | 99 #endif |
96 | 100 |
97 bool videobuf_ready; | 101 bool videobuf_ready; |
98 double videobuf_time; | 102 double videobuf_time; |
99 | 103 |
100 bool audio_cache_ready; | 104 bool audio_cache_ready; |