[ekiga] [windows] Remove VideoForWindows altogether
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] [windows] Remove VideoForWindows altogether
- Date: Thu, 31 Jan 2013 16:54:09 +0000 (UTC)
commit 5b9fbd311b83dbec3a4e34acb22b3fe5948cabe8
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Thu Jan 31 17:52:44 2013 +0100
[windows] Remove VideoForWindows altogether
Like Julien, do a grep before committing :)
lib/engine/gui/gtk-frontend/default_devices.cpp | 10 +++-------
win32/plugin-gconst.cpp | 5 -----
2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/default_devices.cpp b/lib/engine/gui/gtk-frontend/default_devices.cpp
index 9854b57..697a7ea 100644
--- a/lib/engine/gui/gtk-frontend/default_devices.cpp
+++ b/lib/engine/gui/gtk-frontend/default_devices.cpp
@@ -45,14 +45,10 @@ get_default_video_device_name (const gchar * const *options)
int found = -1;
#ifdef WIN32
- /* look for the entry containing "PTLIB/DirectShow" or "PTLIB/VideoForWindows" */
+ // look for the entry containing "PTLIB/DirectShow"
for (int ii = 0; options[ii]; ii++)
- if (g_strrstr (options[ii], "PTLIB/DirectShow")
- || g_strrstr (options[ii], "PTLIB/VideoForWindows")) {
-
- found = ii;
- break;
- }
+ if (g_strrstr (options[ii], "PTLIB/DirectShow"))
+ return options[ii];
#else
/* look for the entry containing "PTLIB/V4L2", otherwise "PTLIB/V4L" */
for (int ii = 0; options[ii]; ii++) {
diff --git a/win32/plugin-gconst.cpp b/win32/plugin-gconst.cpp
index 3f1f3c5..6c47c2f 100644
--- a/win32/plugin-gconst.cpp
+++ b/win32/plugin-gconst.cpp
@@ -12,8 +12,3 @@
#if P_DIRECTSHOW
PPLUGIN_STATIC_LOAD(DirectShow, PVideoInputDevice);
#endif
-
-#if P_VFW_CAPTURE
- PPLUGIN_STATIC_LOAD(VideoForWindows, PVideoInputDevice);
-#endif
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]