Mercurial > hg > forks > bilotrip-mj12

changeset 26:74b28a572438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fence some more vorbis-related things.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Aug 2013 18:21:01 +0300
parents c85ee156a83a
children e29773ac3ceb
files liboggplayer-src/src/imp.hpp liboggplayer-src/src/util.cpp
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/liboggplayer-src/src/imp.hpp	Mon Aug 05 17:34:42 2013 +0300
+++ b/liboggplayer-src/src/imp.hpp	Mon Aug 05 18:21:01 2013 +0300
@@ -5,7 +5,9 @@
 #include <fstream>
 #include <vector>
 #include <theora/theora.h>
+#ifdef VORBIS_SUPPORT
 #include <vorbis/codec.h>
+#endif
 #include <boost/thread.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread/mutex.hpp>
@@ -52,10 +54,12 @@
 
 	ogg_sync_state o_sync;
 
+#ifdef VORBIS_SUPPORT
 	vorbis_comment v_comment;
 	theora_info t_info;
 	theora_comment t_comment;
 	vorbis_info v_info;
+#endif
 
 	ogg_page o_page;
 	ogg_packet o_packet;
@@ -64,8 +68,11 @@
 	ogg_stream_state o_vsstate;
 
 	theora_state t_state;
+
+#ifdef VORBIS_SUPPORT
 	vorbis_dsp_state v_state;
 	vorbis_block v_block;
+#endif
 
 	int pp_level_max;
 	int pp_level;
--- a/liboggplayer-src/src/util.cpp	Mon Aug 05 17:34:42 2013 +0300
+++ b/liboggplayer-src/src/util.cpp	Mon Aug 05 18:21:01 2013 +0300
@@ -5,8 +5,10 @@
 int OggPlayer::Imp::queue_page(ogg_page * page) {
 	if (theora_p)
 		ogg_stream_pagein(&o_tsstate, page);
+#ifdef VORBIS_SUPPORT
 	if (vorbis_p)
 		ogg_stream_pagein(&o_vsstate, page);
+#endif
 	return 0;
 }