Commit 99588f1c authored by smorlat's avatar smorlat
Browse files

a few improvements

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@392 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent a39480c5
[Project]
FileName=linphone.dev
Name=linphone
UnitCount=10
UnitCount=11
PchHead=-1
PchSource=-1
Ver=3
......@@ -184,3 +184,13 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=$(CC) -c buddylookup.c -o Objects/buddylookup.o $(CFLAGS)
[Unit11]
FileName=utils.c
CompileCpp=0
Folder=linphone
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CC) -c utils.c -o Objects/utils.o $(CFLAGS)
......@@ -78,6 +78,9 @@ Source: "..\coreapi\plugins\buddylookup\libbuddylookup.dll"; DestDir: "{app}\lib
Source: "..\..\libsoup\bin\libsoup-2.4-1.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\gnutls-2.6.4\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
;;Directshow capture plugin
Source: "..\mediastreamer2\plugins\msdscap\libmsdscap.dll"; DestDir: "{app}\plugins" ; Flags: ignoreversion
[Icons]
Name: "{group}\Linphone"; Filename: "{app}\linphone.exe" ; WorkingDir: "{app}"
Name: "{userdesktop}\Linphone"; Filename: "{app}\linphone.exe"; WorkingDir: "{app}" ; Tasks: desktopicon
......
[Project]
FileName=mediastreamer2.dev
Name=mediastreamer2
UnitCount=55
UnitCount=57
Type=2
Ver=3
IsCpp=1
......@@ -513,7 +513,7 @@ PrivateResource=
ResourceIncludes=
MakeIncludes=
Compiler=-ggdb_@@_-DINET6 _@@_-DORTP_INET6 _@@_-D_WIN32_WINNT=0x0501 _@@_-DNOSDL_@@_-DVIDEO_ENABLED_@@_-DNORESAMPLE_@@_-Wall _@@_-DHAVE_LIBAVCODEC_AVCODEC_H_@@_-D_TRUE_TIME_@@_
CppCompiler=
CppCompiler=-ggdb_@@_-DINET6 _@@_-DORTP_INET6 _@@_-D_WIN32_WINNT=0x0501 _@@_-Wall _@@_-DHAVE_LIBAVCODEC_AVCODEC_H_@@_
Linker=-lortp_@@_-lswscale_@@_-lavcodec_@@_-lavutil_@@_-ltheora_@@_-lspeex_@@_-lspeexdsp_@@_-lgsm_@@_-lws2_32_@@_-lwinmm_@@_-lvfw32_@@_-logg_@@__@@_
PreprocDefines=
CompilerSettings=0000000000010000000000
......@@ -611,3 +611,23 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=$(CC) -c winvideo2.c -o "Default Profile/winvideo2.o" $(CFLAGS)
[Unit56]
FileName=..\..\src\winvideods.c
CompileCpp=1
Folder=mediastreamer2
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd= $(CPP) -c winvideods.c -o "Default Profile/winvideods.o" $(CXXFLAGS)
[Unit57]
FileName=..\..\src\mingw-dshow.h
CompileCpp=1
Folder=
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
......@@ -128,14 +128,24 @@ MSWebCam * ms_web_cam_manager_get_default_cam(MSWebCamManager *m);
const MSList * ms_web_cam_manager_get_list(MSWebCamManager *m);
/**
* Add a sound card object in a sound card manager's list.
* Add a sound card object in a webcam manager's list.
*
* @param m A sound card manager containing sound cards.
* @param c A sound card object.
* @param m A webcam manager containing webcams
* @param c A web cam object.
*
*/
void ms_web_cam_manager_add_cam(MSWebCamManager *m, MSWebCam *c);
/**
* Add a sound card object on top of list of the webcam manager's list.
*
* @param m A webcam manager containing webcams
* @param c A web cam object.
*
*/
void ms_web_cam_manager_prepend_cam(MSWebCamManager *m, MSWebCam *c);
/**
* Register a sound card description in a sound card manager.
*
......
......@@ -72,6 +72,11 @@ void ms_web_cam_manager_add_cam(MSWebCamManager *m, MSWebCam *c){
m->cams=ms_list_append(m->cams,c);
}
void ms_web_cam_manager_prepend_cam(MSWebCamManager *m, MSWebCam *c){
ms_message("Webcam %s prepended",ms_web_cam_get_string_id(c));
m->cams=ms_list_prepend(m->cams,c);
}
void ms_web_cam_manager_register_desc(MSWebCamManager *m, MSWebCamDesc *desc){
if (desc->detect!=NULL)
desc->detect(m);
......
......@@ -27,7 +27,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/mswebcam.h"
#include "nowebcam.h"
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
#include <libavcodec/avcodec.h>
#else
#include <ffmpeg/avcodec.h>
#endif
#include <dshow.h>
#include <dmodshow.h>
......@@ -35,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <streams.h>
#include <initguid.h>
#include "dxfilter.h"
EXTERN_C const CLSID CLSID_NullRenderer;
......@@ -1414,7 +1420,7 @@ static MSFilterMethod methods[]={
{ 0 , NULL }
};
#ifdef _MSC_VER
#if defined(_MSC_VER) || defined(__cplusplus)
MSFilterDesc ms_v4w_desc={
MS_V4L_ID,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment