Blob Blame History Raw
From d90f2f1094c0d5c6457f2afe1b4231450e847780 Mon Sep 17 00:00:00 2001
From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
Date: Sat, 18 Apr 2009 08:42:10 +0000
Subject: Remove FFMPEG and WAVFile modules from preferences->devices, unused for the moment (Damien dixit).

---
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
index f56d882..8598442 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioInputManager_ptlib::get_devices(std::vector <Ekiga::AudioInputDevice
 
     device.source = sources_array[i];
 
-    if (device.source != "EKIGA") {
+    if ((device.source != "EKIGA") &&
+        (device.source != "WAVFile")) {
       audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Recorder);
       devices_array = audio_devices.ToCharArray ();
 
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
index ac96579..8c83e25 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioOutputManager_ptlib::get_devices(std::vector <Ekiga::AudioOutputDevi
 
     device.source = sources_array[i];
 
-    if (device.source != "EKIGA") {
+    if ((device.source != "EKIGA") &&
+        (device.source != "WAVFile")) {
       audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Player);
       devices_array = audio_devices.ToCharArray ();
 
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index bc21aa1..d550f81 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -75,7 +75,8 @@ void GMVideoInputManager_ptlib::get_devices(std::vector <Ekiga::VideoInputDevice
     if ( (device.source != "YUVFile") &&
          (device.source != "Shm") &&
          (device.source != "FakeVideo") &&
-         (device.source != "EKIGA"    ) ) {
+         (device.source != "EKIGA") &&
+         (device.source != "FFMPEG") ) {
       video_devices = PVideoInputDevice::GetDriversDeviceNames (device.source);
       devices_array = video_devices.ToCharArray ();
   
--
cgit v0.8.2