Changeset 1433:099ab5051a2b in mediastreamer2

Timestamp:

Dec 30, 2011 6:28:28 PM (17 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

cleanup build without video support

Files:

• include/mediastreamer2/mediastream.h (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/mscommon.c (modified) (1 diff)

include/mediastreamer2/mediastream.h

@@ -161 +161 @@
 MS2_PUBLIC void audio_stream_free(AudioStream *stream);
 
-
+#ifdef VIDEO_ENABLED
 /*****************
   Video Support
@@ -266 +266 @@
 MS2_PUBLIC void video_stream_change_decoder(VideoStream *stream, int payload);
 
+#endif /* VIDEO_ENABLED */
+
 MS2_PUBLIC bool_t ms_is_ipv6(const char *address);
 

src/CMakeLists.txt

@@ -15 +15 @@
         dtmfgen.c ice.c tee.c msconf.c msjoin.c msvolume.c mswebcam.c mtu.c void.c eventqueue.c
         dsptools.c kiss_fft.c  kiss_fftr.c equalizer.c audiostream.c tonedetector.c itc.c audiomixer.c)
+
+if(NOT ENABLE_VIDEO) 
+  list(REMOVE_ITEM MS_SRCS mswebcam.c)
+else(NOT ENABLE_VIDEO)
+  add_definitions(-DVIDEO_ENABLED)
+endif(NOT ENABLE_VIDEO)
 
 add_definitions(-DMS2_INTERNAL)

src/mscommon.c

@@ -31 +31 @@
 #include "alldescs.h"
 #include "mediastreamer2/mssndcard.h"
+#ifdef VIDEO_ENABLED
 #include "mediastreamer2/mswebcam.h"
+#endif
 
 #if !defined(_WIN32_WCE)