comparison liboggplayer-src/src/imp.hpp @ 26:74b28a572438

Fence some more vorbis-related things.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Aug 2013 18:21:01 +0300
parents 083c73ceb716
children e29773ac3ceb
comparison
equal deleted inserted replaced
21:c85ee156a83a 26:74b28a572438
3 #include "SDL_audiocvt.hpp" 3 #include "SDL_audiocvt.hpp"
4 #endif 4 #endif
5 #include <fstream> 5 #include <fstream>
6 #include <vector> 6 #include <vector>
7 #include <theora/theora.h> 7 #include <theora/theora.h>
8 #ifdef VORBIS_SUPPORT
8 #include <vorbis/codec.h> 9 #include <vorbis/codec.h>
10 #endif
9 #include <boost/thread.hpp> 11 #include <boost/thread.hpp>
10 #include <boost/bind.hpp> 12 #include <boost/bind.hpp>
11 #include <boost/thread/mutex.hpp> 13 #include <boost/thread/mutex.hpp>
12 #include <boost/thread/locks.hpp> 14 #include <boost/thread/locks.hpp>
13 #include <boost/thread/condition.hpp> 15 #include <boost/thread/condition.hpp>
50 int theora_p; 52 int theora_p;
51 int vorbis_p; 53 int vorbis_p;
52 54
53 ogg_sync_state o_sync; 55 ogg_sync_state o_sync;
54 56
57 #ifdef VORBIS_SUPPORT
55 vorbis_comment v_comment; 58 vorbis_comment v_comment;
56 theora_info t_info; 59 theora_info t_info;
57 theora_comment t_comment; 60 theora_comment t_comment;
58 vorbis_info v_info; 61 vorbis_info v_info;
62 #endif
59 63
60 ogg_page o_page; 64 ogg_page o_page;
61 ogg_packet o_packet; 65 ogg_packet o_packet;
62 66
63 ogg_stream_state o_tsstate; 67 ogg_stream_state o_tsstate;
64 ogg_stream_state o_vsstate; 68 ogg_stream_state o_vsstate;
65 69
66 theora_state t_state; 70 theora_state t_state;
71
72 #ifdef VORBIS_SUPPORT
67 vorbis_dsp_state v_state; 73 vorbis_dsp_state v_state;
68 vorbis_block v_block; 74 vorbis_block v_block;
75 #endif
69 76
70 int pp_level_max; 77 int pp_level_max;
71 int pp_level; 78 int pp_level;
72 int pp_inc; 79 int pp_inc;
73 80