Split of alldescs.h for windows platform.

build/win32-novideo/Makefile.am

-EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastream.vcproj mediastreamer2.def
-
+EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.vcproj mediastream.vcproj mediastreamer2.def

build/win32-novideo/basedescs.h

+#include "mediastreamer2/msfilter.h"
+
+extern MSFilterDesc ms_tee_desc;
+extern MSFilterDesc ms_join_desc;
+MSFilterDesc * ms_base_filter_descs[]={
+&ms_tee_desc,
+&ms_join_desc,
+NULL
+};

build/win32-novideo/alldescs.h → build/win32-novideo/voipdescs.h

@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
 extern MSFilterDesc ms_gsm_dec_desc;
 extern MSFilterDesc ms_gsm_enc_desc;
 extern MSFilterDesc ms_speex_ec_desc;
-extern MSFilterDesc ms_tee_desc;
 extern MSFilterDesc ms_conf_desc;
 //extern MSFilterDesc alsa_write_desc;
 //extern MSFilterDesc alsa_read_desc;
@@ -26,11 +25,10 @@ extern MSFilterDesc ms_conf_desc;
 //extern MSFilterDesc ms_sdl_out_desc;
 //extern MSFilterDesc ms_h263_enc_desc;
 //extern MSFilterDesc ms_h263_dec_desc;
-extern MSFilterDesc ms_join_desc;
 extern MSFilterDesc ms_resample_desc;
 extern MSFilterDesc ms_volume_desc;
 extern MSFilterDesc ms_equalizer_desc;
-MSFilterDesc * ms_filter_descs[]={
+MSFilterDesc * ms_voip_filter_descs[]={
 &ms_alaw_dec_desc,
 &ms_alaw_enc_desc,
 &ms_ulaw_dec_desc,
@@ -45,7 +43,6 @@ MSFilterDesc * ms_filter_descs[]={
 &ms_gsm_dec_desc,
 &ms_gsm_enc_desc,
 &ms_speex_ec_desc,
-&ms_tee_desc,
 &ms_conf_desc,
 //&alsa_write_desc,
 //&alsa_read_desc,
@@ -57,7 +54,6 @@ MSFilterDesc * ms_filter_descs[]={
 //&ms_sdl_out_desc,
 //&ms_h263_enc_desc,
 //&ms_h263_dec_desc,
-&ms_join_desc,
 #ifndef DISABLE_RESAMPLE
 &ms_resample_desc,
 #endif
@@ -65,4 +61,3 @@ MSFilterDesc * ms_filter_descs[]={
 &ms_equalizer_desc,
 NULL
 };
-

build/win32native/Makefile.am

 SUBDIRS=mediastream
 
-EXTRA_DIST=alldescs.h mediastreamer2.sln mediastreamer2.vcproj  videodisplay.vcproj 
-
+EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.sln mediastreamer2.vcproj  videodisplay.vcproj

build/wince/Makefile.am

-EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastreamer2.def
-
+EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.vcproj mediastreamer2.def

build/wince/basedescs.h

+#include "mediastreamer2/msfilter.h"
+
+extern MSFilterDesc ms_tee_desc;
+extern MSFilterDesc ms_join_desc;
+extern MSFilterDesc ms_void_sink_desc;
+MSFilterDesc * ms_base_filter_descs[]={
+&ms_tee_desc,
+&ms_join_desc,
+&ms_void_sink_desc,
+NULL
+};

build/wince/alldescs.h → build/wince/voipdescs.h

@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
 //extern MSFilterDesc ms_gsm_dec_desc;
 //extern MSFilterDesc ms_gsm_enc_desc;
 extern MSFilterDesc ms_speex_ec_desc;
-extern MSFilterDesc ms_tee_desc;
 extern MSFilterDesc ms_conf_desc;
 //extern MSFilterDesc alsa_write_desc;
 //extern MSFilterDesc alsa_read_desc;
@@ -26,11 +25,9 @@ extern MSFilterDesc ms_conf_desc;
 //extern MSFilterDesc ms_sdl_out_desc;
 //extern MSFilterDesc ms_h263_enc_desc;
 //extern MSFilterDesc ms_h263_dec_desc;
-extern MSFilterDesc ms_join_desc;
 extern MSFilterDesc ms_resample_desc;
 extern MSFilterDesc ms_volume_desc;
-extern MSFilterDesc ms_void_sink_desc;
-MSFilterDesc * ms_filter_descs[]={
+MSFilterDesc * ms_voip_filter_descs[]={
 &ms_alaw_dec_desc,
 &ms_alaw_enc_desc,
 &ms_ulaw_dec_desc,
@@ -45,7 +42,6 @@ MSFilterDesc * ms_filter_descs[]={
 //&ms_gsm_dec_desc,
 //&ms_gsm_enc_desc,
 &ms_speex_ec_desc,
-&ms_tee_desc,
 &ms_conf_desc,
 //&alsa_write_desc,
 //&alsa_read_desc,
@@ -57,10 +53,7 @@ MSFilterDesc * ms_filter_descs[]={
 //&ms_sdl_out_desc,
 //&ms_h263_enc_desc,
 //&ms_h263_dec_desc,
-&ms_join_desc,
 &ms_resample_desc,
 &ms_volume_desc,
-&ms_void_sink_desc,
 NULL
 };
-

build/winmob/Makefile.am

-EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def
-
+EXTRA_DIST=basedescs.h voipdescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def

build/winmob/basedescs.h

+#include "mediastreamer2/msfilter.h"
+
+extern MSFilterDesc ms_tee_desc;
+extern MSFilterDesc ms_join_desc;
+extern MSFilterDesc ms_void_sink_desc;
+MSFilterDesc * ms_base_filter_descs[]={
+&ms_tee_desc,
+&ms_join_desc,
+&ms_void_sink_desc,
+NULL
+};

build/winmob/alldescs.h → build/winmob/voipdescs.h

@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
 //extern MSFilterDesc ms_gsm_dec_desc;
 //extern MSFilterDesc ms_gsm_enc_desc;
 extern MSFilterDesc ms_speex_ec_desc;
-extern MSFilterDesc ms_tee_desc;
 extern MSFilterDesc ms_conf_desc;
 //extern MSFilterDesc alsa_write_desc;
 //extern MSFilterDesc alsa_read_desc;
@@ -26,11 +25,9 @@ extern MSFilterDesc ms_conf_desc;
 //extern MSFilterDesc ms_sdl_out_desc;
 //extern MSFilterDesc ms_h263_enc_desc;
 //extern MSFilterDesc ms_h263_dec_desc;
-extern MSFilterDesc ms_join_desc;
 extern MSFilterDesc ms_resample_desc;
 extern MSFilterDesc ms_volume_desc;
-extern MSFilterDesc ms_void_sink_desc;
-MSFilterDesc * ms_filter_descs[]={
+MSFilterDesc * ms_voip_filter_descs[]={
 &ms_alaw_dec_desc,
 &ms_alaw_enc_desc,
 &ms_ulaw_dec_desc,
@@ -45,7 +42,6 @@ MSFilterDesc * ms_filter_descs[]={
 //&ms_gsm_dec_desc,
 //&ms_gsm_enc_desc,
 &ms_speex_ec_desc,
-&ms_tee_desc,
 &ms_conf_desc,
 //&alsa_write_desc,
 //&alsa_read_desc,
@@ -57,10 +53,7 @@ MSFilterDesc * ms_filter_descs[]={
 //&ms_sdl_out_desc,
 //&ms_h263_enc_desc,
 //&ms_h263_dec_desc,
-&ms_join_desc,
 &ms_resample_desc,
 &ms_volume_desc,
-&ms_void_sink_desc,
 NULL
 };
-

src/.gitignore

@@ -4,5 +4,7 @@ Makefile
 .deps
 *.la
 *.lo
-alldescs.h
-filterdescs.txt
+basedescs.h
+voipdescs.h
+basedescs.txt
+voipdescs.txt